diff --git a/recipes/live-desktop-hypervisor-intelcpu-intelgpu.cfg b/recipes/live-desktop-hypervisor-intelcpu-intelgpu.cfg index 1faced6..d55c1bd 100644 --- a/recipes/live-desktop-hypervisor-intelcpu-intelgpu.cfg +++ b/recipes/live-desktop-hypervisor-intelcpu-intelgpu.cfg @@ -5,20 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file contains the recipe to bootstrap a live desktop hypervisor configured for Intel(tm) CPU and Intel(tm) GPUs compatible with vfio-mdev (pre-Tiger Lake) +# What ? This kickstart file bootstraps a live desktop hypervisor configured for Intel(tm) CPU and Intel(tm) GPUs compatible with vfio-mdev (pre-Tiger Lake) -# Flattening - -# This file needs to be flattened: flattening is like cooking ingredients in a specific order to make a dish. -# You can do that with the ksflatten tool provided by the pykickstart package on Fedora: +# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. +# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : # ksflatten -c live-desktop-hypervisor-intelcpu-intelgpu -o ../dishes/live-phyllome-desktop-intelcpu-intelgpu.cfg # Instructions for creating an ISO file: - -# Temporary disable SELinux with +# Temporary disable SELinux: # setenforce 0 -# Use the following command to create an ISO file, as the root user: -# livemedia-creator --make-iso --ks ../dishes/live-phyllome-desktop-intelcpu-intelgpu.cfg --no-virt --iso-only --iso-name phyllome-desktop-intelcpu-intelgpu-x86_64.iso --releasever 35 +# Use the following command to create an ISO file, as the root user: +# livemedia-creator --make-iso --ks ../dishes/live-phyllome-desktop-intelcpu-intelgpu.cfg --no-virt --iso-only --iso-name phyllome-desktop-intelcpu-intelgpu-x86_64.iso --releasever 38 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: @@ -31,7 +28,6 @@ %include ../ingredients/base-live.cfg # A minimal base for live systems %include ../ingredients/base-desktop-gnome.cfg # A desktop environment based on GNOME Shell %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include ../ingredients/base-live-desktop-quirks.cfg # Some live-related quirks %include ../ingredients/base-hypervisor.cfg # A base hypervisor %include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs %include ../ingredients/base-hypervisor-intelgpu.cfg # Specific virtualization configuration for Intel (tm) GPUs from 4th to the 9th generation (compatible with vfio-mdev). \ No newline at end of file diff --git a/recipes/live-desktop-hypervisor-intelcpu.cfg b/recipes/live-desktop-hypervisor-intelcpu.cfg index c6f663f..ebc1a87 100644 --- a/recipes/live-desktop-hypervisor-intelcpu.cfg +++ b/recipes/live-desktop-hypervisor-intelcpu.cfg @@ -5,20 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file contains the recipe to bootstrap a live desktop hypervisor machine configured for Intel(tm) CPU. +# What ? This kickstart file bootstraps a live desktop hypervisor machine configured for Intel(tm) CPU. -# Flattening - -# This file needs to be flattened: flattening is like cooking ingredients in a specific order to make a dish. -# You can do that with the ksflatten tool provided by the pykickstart package on Fedora: +# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. +# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : # ksflatten -c live-desktop-hypervisor-intelcpu.cfg -o ../dishes/live-phyllome-desktop-intelcpu.cfg # Instructions for creating an ISO file: - -# Temporary disable SELinux with +# Temporary disable SELinux: # setenforce 0 -# Use the following command to create an ISO file, as the root user: -# livemedia-creator --make-iso --ks ../dishes/live-phyllome-desktop-intelcpu.cfg --no-virt --iso-only --iso-name phyllome-desktop-intelcpu-x86_64.iso --releasever 35 +# Use the following command to create an ISO file, as the root user: +# livemedia-creator --make-iso --ks ../dishes/live-phyllome-desktop-intelcpu.cfg --no-virt --iso-only --iso-name phyllome-desktop-intelcpu-x86_64.iso --releasever 38 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: @@ -31,6 +28,5 @@ %include ../ingredients/base-live.cfg # A minimal base for live systems %include ../ingredients/base-desktop-gnome.cfg # A desktop environment based on GNOME Shell %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include ../ingredients/base-live-desktop-quirks.cfg # Some live-related quirks %include ../ingredients/base-hypervisor.cfg # A base hypervisor %include ../ingredients/base-hypervisor-intelcpu.cfg # Specific virtualization configuration for Intel (tm) CPUs diff --git a/recipes/live-desktop-hypervisor.cfg b/recipes/live-desktop-hypervisor.cfg index 6c245c3..047bd9a 100644 --- a/recipes/live-desktop-hypervisor.cfg +++ b/recipes/live-desktop-hypervisor.cfg @@ -5,10 +5,10 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file contains the recipe to bootstrap a live desktop hypervisor machine. +# What ? This kickstart file bootstraps a live desktop hypervisor machine. -# This file needs to be flattened: flattening is like cooking ingredients in a specific order to make a dish. -# You can do that with the ksflatten tool provided by the pykickstart package on Fedora : +# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. +# Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : # ksflatten -c live-desktop-hypervisor.cfg -o ../dishes/live-phyllome-desktop.cfg # Instructions for creating an ISO file @@ -28,5 +28,4 @@ %include ../ingredients/base-live.cfg # A minimal base for live systems %include ../ingredients/base-desktop-gnome.cfg # A desktop environment based on GNOME Shell %include ../ingredients/base-desktop-virtual-machine-manager.cfg # the virtual machine manager -%include ../ingredients/base-live-desktop-quirks.cfg # Some live-related quirks %include ../ingredients/base-hypervisor.cfg # A base hypervisor \ No newline at end of file diff --git a/recipes/live-desktop.cfg b/recipes/live-desktop.cfg index 421a8c5..59c8b73 100644 --- a/recipes/live-desktop.cfg +++ b/recipes/live-desktop.cfg @@ -10,16 +10,12 @@ # In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : # ksflatten -c live-desktop.cfg -o ../dishes/live-desktop.cfg -# IMPORTANT : Weak dependencies to be destroyed in the resulting ks -# Instructions for livecd-creator (about to be deprecated) -# An ISO file can be created using the following command as *root*: -# livecd-creator -c ../leaves/live-desktop.cfg --fslabel=live-desktop -# livecd-creator is part of the livecd-tools package - -# Instructions for livemedia-creator -# An ISO file can be created using the following command as *root*: -# livemedia-creator --make-iso --ks live-desktop.cfg --no-virt --iso-only --iso-name live-desktop-x86_64.iso --releasever 35 +# Instructions for creating an ISO file +# Temporary disable SELinux: +# setenforce 0 +# Use the following command to create an ISO file, as the root user: +# livemedia-creator --make-iso --ks live-desktop.cfg --no-virt --iso-only --iso-name live-desktop-x86_64.iso --releasever 38 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: @@ -27,92 +23,9 @@ # BIOS test: # qemu-kvm -m 2048 -vga qxl live-desktop-x86_64.iso -%include ../ingredients/base-live.cfg # A base for a minimal live machine -%include ../ingredients//base-desktop-gnome.cfg # A base for a desktop environment +%include ../ingredients/base-fedora-repo.cfg # offical repositories for Fedora +%include ../ingredients/base-live.cfg # A minimal base for live systems +%include ../ingredients/base-storage-live.cfg # a base storage for live systems +%include ../ingredients/base-desktop-gnome.cfg # A desktop environment based on GNOME Shell -%post --log=/root/ld.log # Beginning of %post section. The following commands are executed inside a chroot environment. Add logging - -cat >> /etc/rc.d/init.d/livesys << EOF - -# # disable gnome-software automatically downloading updates -# cat >> /usr/share/glib-2.0/schemas/org.gnome.software.gschema.override << FOE -# [org.gnome.software] -# download-updates=false -# FOE -# -# # don't autostart gnome-software session service -# rm -f /etc/xdg/autostart/gnome-software-service.desktop - -# # disable the gnome-software shell search provider -# cat >> /usr/share/gnome-shell/search-providers/org.gnome.Software-search-provider.ini << FOE -# DefaultDisabled=true -# FOE - -# # don't run gnome-initial-setup -# mkdir ~liveuser/.config -# touch ~liveuser/.config/gnome-initial-setup-done - -# suppress anaconda spokes redundant with gnome-initial-setup -# cat >> /etc/sysconfig/anaconda << FOE -# [NetworkSpoke] -# visited=1 -# -# [PasswordSpoke] -# visited=1 -# -# [UserSpoke] -# visited=1 -# FOE - -## make the installer show up -#if [ -f /usr/share/applications/liveinst.desktop ]; then -# # Show harddisk install in shell dash -# sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" -# # need to move it to anaconda.desktop to make shell happy -# mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop -# -# cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -# [org.gnome.shell] -# favorite-apps=['firefox.desktop', 'org.gnome.Calendar.desktop', 'rhythmbox.desktop', 'org.gnome.Photos.desktop', 'org.gnome.Nautilus.desktop', 'anaconda.desktop'] -# FOE -# -# # Make the welcome screen show up -# if [ -f /usr/share/anaconda/gnome/fedora-welcome.desktop ]; then -# mkdir -p ~liveuser/.config/autostart -# cp /usr/share/anaconda/gnome/fedora-welcome.desktop /usr/share/applications/ -# cp /usr/share/anaconda/gnome/fedora-welcome.desktop ~liveuser/.config/autostart/ -# fi -# -# # Disable GNOME welcome tour so it doesn't overlap with Fedora welcome screen -# cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE -# welcome-dialog-last-shown-version='4294967295' -# FOE -# -# # Copy Anaconda branding in place -# if [ -d /usr/share/lorax/product/usr/share/anaconda ]; then -# cp -a /usr/share/lorax/product/* / -# fi -# fi - -# rebuild schema cache with any overrides we installed -# glib-compile-schemas /usr/share/glib-2.0/schemas - -# set up auto-login -cat > /etc/gdm/custom.conf << FOE -[daemon] -AutomaticLoginEnable=True -AutomaticLogin=liveuser -FOE - -# Turn off PackageKit-command-not-found while uninstalled -# if [ -f /etc/PackageKit/CommandNotFound.conf ]; then -# sed -i -e 's/^SoftwareSourceSearch=true/SoftwareSourceSearch=false/' /etc/PackageKit/CommandNotFound.conf -# fi - -# make sure to set the right permissions and selinux contexts -chown -R liveuser:liveuser /home/liveuser/ -restorecon -R /home/liveuser/ - -EOF - -%end # End of the %post section \ No newline at end of file +poweroff # Shut down the system after a successful installation \ No newline at end of file