From a0c7208c3f17934a2c514bb2b47856bdccf12d5e Mon Sep 17 00:00:00 2001 From: Lukas Date: Wed, 18 Aug 2021 15:01:51 +0200 Subject: [PATCH] cleaning the files, removing most references to Fedora, before comprehensive testing --- leaves/bamd.cfg | 2 +- leaves/bdmd.cfg | 11 +++++++++-- leaves/bhmd.cfg | 5 ++--- leaves/bimd.cfg | 4 ++-- leaves/blmd.cfg | 4 ++-- leaves/bmd.cfg | 8 ++++---- leaves/dhamd.cfg | 10 ++++------ leaves/dhimd.cfg | 6 +++--- leaves/dhmd.cfg | 9 ++++----- leaves/dmd.cfg | 10 ++++------ leaves/ldhamd.cfg | 12 +++++------- leaves/ldhimd.cfg | 14 ++++++-------- leaves/ldhmd.cfg | 10 ++++------ leaves/ldmd.cfg | 30 +++--------------------------- leaves/lhdmd.cfg | 6 +++--- 15 files changed, 56 insertions(+), 85 deletions(-) diff --git a/leaves/bamd.cfg b/leaves/bamd.cfg index ebb1ef7..efd0088 100644 --- a/leaves/bamd.cfg +++ b/leaves/bamd.cfg @@ -11,7 +11,7 @@ %post # Beginning of %post section sed -i 's/\(quiet\)/\1 amd_iommu=on amd_iommu=pt rd.driver.pre=vfio-pci/i' /etc/default/grub # Load kernel modules in grub. -dracut --force # Regenerate initramfs +dracut --force # Regenerate initramfs. grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub %end # End of the %post section \ No newline at end of file diff --git a/leaves/bdmd.cfg b/leaves/bdmd.cfg index 1c3c2c3..cb6db43 100644 --- a/leaves/bdmd.cfg +++ b/leaves/bdmd.cfg @@ -5,10 +5,10 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file is a base for a minimal GNOME-based desktop-oriented machine. +# What ? This kickstart file is a base for a minimal desktop-oriented machine. # 'b' for basic building block, 'd' for desktop, 'm' for minimal, 'd' for development only. -# xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland # firstboot --enable --reconfig # Initial Setup will start after the first reboot %packages --excludedocs # Beginning of the post-installation section @@ -23,4 +23,11 @@ gnome-terminal -gnome-tour # We don't want GNOME-tour to open at launch so we delete it nano # Minimal GNOME shell or desktop environment plus the nano text editor +%end + +%post + +# set new background +gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/elementary/'Morskie Oko.jpg' + %end \ No newline at end of file diff --git a/leaves/bhmd.cfg b/leaves/bhmd.cfg index 9e4a570..f5a1c73 100644 --- a/leaves/bhmd.cfg +++ b/leaves/bhmd.cfg @@ -30,13 +30,12 @@ echo "vfio-pci" > /etc/modules-load.d/vfio-pci.conf echo "vfio_iommu_type1" > /etc/modules-load.d/vfio_iommu_type1.conf echo "vfio_virqfd" > /etc/modules-load.d/vfio_virqfd.conf -dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd " --force # Instruct dracut to load the vfio drivers: +dracut --add-drivers " vfio vfio-pci vfio_iommu_type1 vfio_virqfd " --force # Instruct dracut to load the vfio drivers mkdir /var/lib/libvirt/iso # Create a directory to store iso images # chown liveuser:liveuser /var/lib/libvirt/iso # Make the user "liveuser" the owner of this directory -virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called `poo> +virsh pool-create-as --name iso --type dir --target /var/lib/libvirt/iso # Make libvirt aware of this new directory by creating a so-called 'pool' # mkdir /var/lib/libvirt/rom # Create a directory to store rom files # chown liveuser:liveuser /var/lib/libvirt/rom # Make the user "test" its owner -# virsh pool-create-as --name rom --type dir --target /var/lib/libvirt/rom # Make libvirt aware of this new directory by creating a so-called `p> # chown liveuser:liveuser /var/lib/libvirt/images # Make the user "test" the owner of this directory nmcli con add ifname br0 type bridge con-name br0 # Add a network bridge diff --git a/leaves/bimd.cfg b/leaves/bimd.cfg index 9d84478..87ecc21 100644 --- a/leaves/bimd.cfg +++ b/leaves/bimd.cfg @@ -11,8 +11,8 @@ %post # Beginning of %post section sed -i 's/\(quiet\)/\1 intel_iommu=on iommu=pt rd.driver.pre=vfio-pci i915.enable_gvt=1/i' /etc/default/grub # Load kernel modules in grub. -echo "kvmgt" > /etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia -echo "vfio-mdev" > /etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel GVT-g and Nvidia +echo "kvmgt" > /etc/modules-load.d/kvmgt.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) +echo "vfio-mdev" > /etc/modules-load.d/vfio-mdev.conf # Load specific kernel modules kvmgt and vfio-mdev, for Intel (tm) GVT-g and Nvidia (tm) dracut --add-drivers "vfio-mdev kvmgt" --force # Instruct dracut to load the vfio drivers: dracut --force # Regenerate initramfs diff --git a/leaves/blmd.cfg b/leaves/blmd.cfg index 4bf26e5..d6ed850 100644 --- a/leaves/blmd.cfg +++ b/leaves/blmd.cfg @@ -337,8 +337,8 @@ rm -f /var/lib/systemd/random-seed # convince readahead not to collect # FIXME: for systemd -echo 'File created by kickstart. See systemd-update-done.service(8).' \ - | tee /etc/.updated >/var/.updated +echo 'File created by kickstart. See systemd-update-done.service(8).' +tee /etc/.updated >/var/.updated # Drop the rescue kernel and initramfs, we don't need them on the live media itself. # See bug 1317709 diff --git a/leaves/bmd.cfg b/leaves/bmd.cfg index f711047..75e8ee4 100644 --- a/leaves/bmd.cfg +++ b/leaves/bmd.cfg @@ -5,7 +5,7 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ # -# What ? This kickstart file provides a base system based on Fedora 34 server. +# What ? This kickstart file provides a base system based on Fedora 34. # 'b' for basic building block, 'm' for minimal, 'd' for development only. # Know bug: Cannot resolve host name @@ -35,15 +35,15 @@ firewall --enabled # Make sure the firewall is enabled services --enabled=NetworkManager --disabled=sshd network --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome # Configure network interfaces and set hostname -# ignoredisk --only-use=vda # Only use disk labelled as vda zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record -clearpart --all --initlabel # --drives=vda # Partition clearing information. This setup uses GPT by default. +clearpart --all --initlabel # Partition clearing information. This setup uses GPT by default. part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt" --label=efi # Will create an efi partitition of 128 MiB (vda1) part /boot --fstype="ext4" --size=384 --label=boot # Create a boot partition of 384 MiB using the ext4 filesystem (vda2). part / --fstype="ext4" --grow --label=root # The remaining space will be used for root (vda3). bootloader --timeout=1 # Set the Grub bootloader timeout to 1 -reboot --kexec # Reboot straight inot the system after a successfull installation +poweroff # Power off the system after a sucessfull installation +# reboot --kexec # Reboot straight into the system after a successfull installation # firstboot --enable # Initial Setup will start after the first reboot %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. diff --git a/leaves/dhamd.cfg b/leaves/dhamd.cfg index dd46f0a..5f528d1 100644 --- a/leaves/dhamd.cfg +++ b/leaves/dhamd.cfg @@ -11,9 +11,7 @@ # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include bmd.cfg # A minimal machine based on Fedora 34 -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 -%include bamd.cfg # Specific virtualization configuration for AMD (tm) CPUs - -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +%include bmd.cfg # A minimal machine +%include bdmd.cfg # A desktop environment +%include bhmd.cfg # A base hypervisor +%include bamd.cfg # Specific virtualization configuration for AMD (tm) CPUs \ No newline at end of file diff --git a/leaves/dhimd.cfg b/leaves/dhimd.cfg index 4cc497c..cf0718c 100644 --- a/leaves/dhimd.cfg +++ b/leaves/dhimd.cfg @@ -11,7 +11,7 @@ # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include bmd.cfg # A minimal machine based on Fedora 34 -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 +%include bmd.cfg # A minimal machine +%include bdmd.cfg # A desktop environment +%include bhmd.cfg # A base hypervisor %include bimd.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) Graphics diff --git a/leaves/dhmd.cfg b/leaves/dhmd.cfg index 5016335..a6481f8 100644 --- a/leaves/dhmd.cfg +++ b/leaves/dhmd.cfg @@ -5,14 +5,13 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop hypervisor based on Fedora 34 expecting Intel(tm) CPU and Intel(tm) Graphics. +# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) Graphics. # 'd' for desktop, 'h' for hypervisor, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include bmd.cfg # A minimal machine based on Fedora 34 -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 +%include bmd.cfg # A minimal machine +%include bdmd.cfg # A desktop environment +%include bhmd.cfg # A base hypervisor -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland diff --git a/leaves/dmd.cfg b/leaves/dmd.cfg index 85140be..5ecb8ae 100644 --- a/leaves/dmd.cfg +++ b/leaves/dmd.cfg @@ -5,13 +5,11 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop machine based on Fedora 34. +# What ? This kickstart file bootstraps a desktop machine. # 'd' for desktop, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye +# Bye bye! -%include bmd.cfg # A base system based on Fedora 34. -%include bdmd.cfg # desktop machine based on Fedora 34. - -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +%include bmd.cfg # A base system +%include bdmd.cfg # desktop machine \ No newline at end of file diff --git a/leaves/ldhamd.cfg b/leaves/ldhamd.cfg index 9aaa9c0..47b51e5 100644 --- a/leaves/ldhamd.cfg +++ b/leaves/ldhamd.cfg @@ -5,15 +5,13 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop hypervisor configured for AMD (tm) CPUs. +# What ? This kickstart file bootstraps a live desktop hypervisor configured for AMD (tm) CPUs. # 'l' for live, 'd' for desktop, 'h' for hypervisor', 'a' for amd, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include blmd.cfg # A base for a minimal live machine based on Fedora 34. -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 -%include bamd.cfg # Specific virtualization configuration for AMD (tm) CPUs - -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +%include blmd.cfg # A base for a minimal live machine +%include bdmd.cfg # A desktop environment +%include bhmd.cfg # A base hypervisor +%include bamd.cfg # Specific virtualization configuration for AMD (tm) CPUs \ No newline at end of file diff --git a/leaves/ldhimd.cfg b/leaves/ldhimd.cfg index 9710137..cbfdbc7 100644 --- a/leaves/ldhimd.cfg +++ b/leaves/ldhimd.cfg @@ -5,15 +5,13 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) Graphics. -# 'l' for live, 'd' for desktop, 'h' for hypervisor', 'i' for intel, 'm' for minimal, 'd' for development only. +# What ? This kickstart file bootstraps a live desktop hypervisor configured for Intel(tm) CPU and Intel(tm) Graphics. +# 'l' for live, 'd' for desktop, 'h' for hypervisor, 'i' for intel, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include blmd.cfg # A base for a minimal live machine based on Fedora 34. -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 -%include bimd.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) Graphics - -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +%include blmd.cfg # A base for a minimal live machine +%include bdmd.cfg # A desktop machine based +%include bhmd.cfg # A base hypervisor based +%include bimd.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) Graphics \ No newline at end of file diff --git a/leaves/ldhmd.cfg b/leaves/ldhmd.cfg index e086719..7649e52 100644 --- a/leaves/ldhmd.cfg +++ b/leaves/ldhmd.cfg @@ -5,14 +5,12 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop hypervisor based on Fedora 34 expecting Intel(tm) CPU and Intel(tm) Graphics. +# What ? This kickstart file bootstraps a live desktop hypervisor expecting Intel(tm) CPU and Intel(tm) Graphics. # 'l' for live, 'd' for desktop, 'h' for hypervisor, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye! -%include blmd.cfg # A base for a minimal live machine based on Fedora 34. -%include bdmd.cfg # A desktop machine based on Fedora 34 -%include bhmd.cfg # A base hypervisor based on Fedora 34 - -xconfig --startxonboot --defaultdesktop=GNOME # Start GNOME on boot. Althought it says X, it works as well with Wayland +%include blmd.cfg # A base for a minimal live machine +%include bdmd.cfg # A desktop machine +%include bhmd.cfg # A base hypervisor \ No newline at end of file diff --git a/leaves/ldmd.cfg b/leaves/ldmd.cfg index 800d75c..d56832e 100644 --- a/leaves/ldmd.cfg +++ b/leaves/ldmd.cfg @@ -5,43 +5,19 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a live desktop machine based on Fedora 34. +# What ? This kickstart file bootstraps a live desktop machine. # 'l' for live, 'd' for desktop, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye -%include blmd.cfg # A base for a minimal live machine based on Fedora 34. -%include bdmd.cfg # A base for a desktop machine based on Fedora 34 - -# part / --size 7680 +%include blmd.cfg # A base for a minimal live machine +%include bdmd.cfg # A base for a desktop environment %post -# set new background -gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/elementary/'Morskie Oko.jpg' - cat >> /etc/rc.d/init.d/livesys << EOF -# 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', > -#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 - # rebuild schema cache with any overrides we installed glib-compile-schemas /usr/share/glib-2.0/schemas diff --git a/leaves/lhdmd.cfg b/leaves/lhdmd.cfg index 72070a6..3355715 100644 --- a/leaves/lhdmd.cfg +++ b/leaves/lhdmd.cfg @@ -5,14 +5,14 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a live desktop machine based on Fedora 34. +# What ? This kickstart file bootstraps a live desktop machine. # 'l' for live, 'h' for hypervisor, 'd' for desktop, 'm' for minimal, 'd' for development only. # ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. # Bye bye -%include ldmd.cfg # A base for a minimal live machine based on Fedora 34. -%include bhmd.cfg # A base hypervisor based on Fedora 34 +%include ldmd.cfg # A base for a live desktop minimal machine +%include bhmd.cfg # A base hypervisor %packages