From c2c4e833218c1a613eb3874d5c7572e791e9000a Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 26 Nov 2021 16:21:00 +0100 Subject: [PATCH] correct links rewrite the comment section --- blocks-live/live-desktop-hypervisor-a.cfg | 19 +++++++++---------- blocks-live/live-desktop-hypervisor-ii.cfg | 21 ++++++++++----------- blocks-live/live-desktop-hypervisor.cfg | 15 +++++++-------- blocks-live/live-desktop.cfg | 15 +++++++-------- blocks-live/live-server-hypervisor-ii.cfg | 3 +-- blocks/desktop-hypervisor-a.cfg | 2 +- blocks/desktop-hypervisor-ii.cfg | 2 +- blocks/desktop-hypervisor.cfg | 5 +++-- blocks/desktop.cfg | 5 +---- blocks/nano.cfg | 2 +- 10 files changed, 41 insertions(+), 48 deletions(-) diff --git a/blocks-live/live-desktop-hypervisor-a.cfg b/blocks-live/live-desktop-hypervisor-a.cfg index ef3f3dc..64f51c8 100644 --- a/blocks-live/live-desktop-hypervisor-a.cfg +++ b/blocks-live/live-desktop-hypervisor-a.cfg @@ -6,31 +6,30 @@ # /_/ /____/ # 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 # 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 ldha.cfg -o ../leaves/flat-ldha.cfg +# ksflatten -c live-desktop-hypervisor-a.cfg -o ../leaves/phyllome-desktop-live-a.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/flat-ldha.cfg --fslabel=ldha +# livecd-creator -c ../leaves/phyllome-desktop-live-a.cfg --fslabel=phyllome-desktop-live-a # 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 flat-ldha.cfg --no-virt --iso-only --iso-name phyllome-live-dha-x86_64.iso --releasever 35 +# livemedia-creator --make-iso --ks phyllome-desktop-live-a.cfg --no-virt --iso-only --iso-name phyllome-desktop-live-a-x86_64.iso --releasever 35 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: -# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-live-dha-x86_64.iso +# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-desktop-live-a-x86_64.iso # BIOS test: -# qemu-kvm -m 2048 -vga qxl phyllome-live-dha-x86_64.iso +# qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-a-x86_64.iso -%include ld.cfg # A base for a live desktop minimal machine -%include bhl.cfg # A base hypervisor -%include bhla.cfg # Specific virtualization configuration for AMD (tm) CPUs +%include live-desktop.cfg # A base for a live desktop minimal machine +%include base-live-hypervisor.cfg # A base hypervisor +%include base-live-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. @@ -38,7 +37,7 @@ virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM %end # End of the packages section -%post --log=/root/ldha.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. +%post --log=/root/live-desktop-hypervisor-a.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. usermod -a -G libvirt liveuser # Make user "liveuser" part of the existing libvirt group to allow it to interact with the guest-hypervisor. chown liveuser:liveuser /var/lib/libvirt/iso # Make the user "liveuser" the owner of this directory diff --git a/blocks-live/live-desktop-hypervisor-ii.cfg b/blocks-live/live-desktop-hypervisor-ii.cfg index 3c3a170..3d3ce36 100644 --- a/blocks-live/live-desktop-hypervisor-ii.cfg +++ b/blocks-live/live-desktop-hypervisor-ii.cfg @@ -5,32 +5,31 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a live desktop hypervisor configured for Intel(tm) CPU and Intel(tm) graphic cards. -# 'l' for live, 'd' for desktop, 'h' for hypervisor, 'i' for intel +# What ? This kickstart file bootstraps a live desktop hypervisor configured for Intel(tm) CPUs and Intel(tm) GPUs. # 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 ldhi.cfg -o ../leaves/flat-ldhi.cfg +# ksflatten -c live-desktop-hypervisor-ii.cfg -o ../leaves/phyllome-desktop-live-ii.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/flat-ldhi.cfg --fslabel=ldhi +# livecd-creator -c ../leaves/phyllome-desktop-live-ii.cfg --fslabel=phyllome-desktop-live-ii # 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 flat-ldhi.cfg --no-virt --iso-only --iso-name phyllome-live-dhi-x86_64.iso --releasever 35 +# livemedia-creator --make-iso --ks phyllome-desktop-live-ii.cfg --no-virt --iso-only --iso-name phyllome-desktop-live-ii.iso --releasever 35 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: -# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-live-ldhi-x86_64.iso +# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-desktop-live-ii-x86_64.iso # BIOS test: -# qemu-kvm -m 2048 -vga qxl phyllome-live-ldhi-x86_64.iso +# qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-ii-x86_64.iso -%include ld.cfg # A base for a live desktop minimal machine -%include bhl.cfg # A base hypervisor -%include bhli.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) graphic cards +%include live-desktop.cfg # A base for a live desktop minimal machine +%include base-live-hypervisor.cfg # A base hypervisor +%include base-live-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPUs and Intel(tm) GPUs %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. @@ -38,7 +37,7 @@ virt-manager # Install virt-manager, the graphical front-end for QEMU/KVM %end # End of the packages section -%post --log=/root/ldhi.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. +%post --log=/root/phyllome-desktop-ii.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. usermod -a -G libvirt liveuser # Make user "liveuser" part of the existing libvirt group to allow it to interact with the guest-hypervisor. chown liveuser:liveuser /var/lib/libvirt/iso # Make the user "liveuser" the owner of this directory diff --git a/blocks-live/live-desktop-hypervisor.cfg b/blocks-live/live-desktop-hypervisor.cfg index b1d0552..732c14a 100644 --- a/blocks-live/live-desktop-hypervisor.cfg +++ b/blocks-live/live-desktop-hypervisor.cfg @@ -6,30 +6,29 @@ # /_/ /____/ # What ? This kickstart file bootstraps a live desktop hypervisor machine. -# 'l' for live, 'h' for hypervisor, 'd' for desktop # 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 ldh.cfg -o ../leaves/flat-ldh.cfg +# ksflatten -c live-desktop-hypervisor.cfg -o ../leaves/phyllome-desktop-live.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/flat-ldh.cfg --fslabel=ldh +# livecd-creator -c ../leaves/phyllome-desktop-live.cfg --fslabel=phyllome-desktop-live # 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 flat-ldh.cfg --no-virt --iso-only --iso-name phyllome-live-dh-x86_64.iso --releasever 35 +# livemedia-creator --make-iso --ks phyllome-desktop-live.cfg --no-virt --iso-only --iso-name phyllome-desktop-live-x86_64.iso --releasever 35 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: -# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-live-dh-x86_64.iso +# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-desktop-live-x86_64.iso # BIOS test: -# qemu-kvm -m 2048 -vga qxl phyllome-live-dh-x86_64.iso +# qemu-kvm -m 2048 -vga qxl phyllome-desktop-live-x86_64.iso -%include ld.cfg # A base for a live desktop minimal machine -%include bhl.cfg # A base hypervisor +%include live-desktop.cfg # A base for a live desktop minimal machine +%include base-live-hypervisor.cfg # A base hypervisor %packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. diff --git a/blocks-live/live-desktop.cfg b/blocks-live/live-desktop.cfg index a9ebdbe..df4fea2 100644 --- a/blocks-live/live-desktop.cfg +++ b/blocks-live/live-desktop.cfg @@ -6,30 +6,29 @@ # /_/ /____/ # What ? This kickstart file bootstraps a live desktop machine. -# 'l' for live, 'd' for desktop # 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 ld.cfg -o ../leaves/flat-ld.cfg +# ksflatten -c live-desktop.cfg -o ../leaves/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/flat-ld.cfg --fslabel=ld +# 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 flat-ld.cfg --no-virt --iso-only --iso-name phyllome-live-d-x86_64.iso --releasever 35 +# livemedia-creator --make-iso --ks live-desktop.cfg --no-virt --iso-only --iso-name live-desktop-x86_64.iso --releasever 35 # The resulting ISO can be tested with qemu-kvm, using the following these two commands, as *root*: # UEFI test: -# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl phyllome-live-d-x86_64.iso +# qemu-kvm -bios /usr/share/edk2/ovmf/OVMF_CODE.fd -m 2048 -vga qxl live-desktop-x86_64.iso # BIOS test: -# qemu-kvm -m 2048 -vga qxl phyllome-live-d-x86_64.iso +# qemu-kvm -m 2048 -vga qxl live-desktop-x86_64.iso -%include bl.cfg # A base for a minimal live machine -%include "../blocks/bd.cfg" # A base for a desktop environment +%include base-live.cfg # A base for a minimal live machine +%include "../blocks/base-desktop-gnome.cfg" # A base for a desktop environment %post --log=/root/ld.log # Beginning of %post section. The following commands are executed inside a chroot environment. Add logging diff --git a/blocks-live/live-server-hypervisor-ii.cfg b/blocks-live/live-server-hypervisor-ii.cfg index dacc3f7..483b6f7 100644 --- a/blocks-live/live-server-hypervisor-ii.cfg +++ b/blocks-live/live-server-hypervisor-ii.cfg @@ -5,5 +5,4 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system with a hypervisor optimized for Intel (tm) CPUs -# 'l' for live, 's' for server, 'h' for hypervisor', 'i' for intel \ No newline at end of file +# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system with a hypervisor optimized for Intel (tm) CPUs and GPUs diff --git a/blocks/desktop-hypervisor-a.cfg b/blocks/desktop-hypervisor-a.cfg index f209a12..09521f8 100644 --- a/blocks/desktop-hypervisor-a.cfg +++ b/blocks/desktop-hypervisor-a.cfg @@ -14,7 +14,7 @@ %include base-fedora-repo.cfg # offical repositories for Fedora %include base-storage.cfg # base storage %include base.cfg # A minimal machine -%include base-desktop.cfg # A desktop environment +%include base-desktop-gnome.cfg # A desktop environment %include base-hypervisor.cfg # A base hypervisor %include base-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs diff --git a/blocks/desktop-hypervisor-ii.cfg b/blocks/desktop-hypervisor-ii.cfg index 12fb298..0dce090 100644 --- a/blocks/desktop-hypervisor-ii.cfg +++ b/blocks/desktop-hypervisor-ii.cfg @@ -14,7 +14,7 @@ %include base-fedora-repo.cfg # offical repositories for Fedora %include base-storage.cfg # base storage %include base.cfg # A minimal machine -%include base-desktop.cfg # A desktop environment +%include base-desktop-gnome.cfg # A desktop environment %include base-hypervisor.cfg # A base hypervisor %include base-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) GPUs diff --git a/blocks/desktop-hypervisor.cfg b/blocks/desktop-hypervisor.cfg index db1f8f3..ec46310 100644 --- a/blocks/desktop-hypervisor.cfg +++ b/blocks/desktop-hypervisor.cfg @@ -14,7 +14,7 @@ %include base-fedora-repo.cfg # offical repositories for Fedora %include base-storage.cfg # base storage %include base.cfg # A minimal machine -%include base-desktop.cfg # A desktop environment +%include base-desktop-gnome.cfg # A desktop environment %include base-hypervisor.cfg # A base hypervisor reboot --kexec # Reboot straight into the system after a successfull installation @@ -46,4 +46,5 @@ skip=privacy providers=local-first! EOF -%end # End of the %post section \ No newline at end of file +%end # End of the %post section + diff --git a/blocks/desktop.cfg b/blocks/desktop.cfg index 8aec033..ad95fe6 100644 --- a/blocks/desktop.cfg +++ b/blocks/desktop.cfg @@ -14,7 +14,7 @@ %include base-fedora-repo.cfg # offical repositories for Fedora %include base-storage.cfg # base storage %include base.cfg # A minimal machine -%include base-desktop.cfg # A desktop environment +%include base-desktop-gnome.cfg # A desktop environment reboot --kexec # Reboot straight into the system after a successfull installation @@ -28,9 +28,6 @@ gnome-initial-setup # Add GNOME initial setup too. truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available -# set new default background (doesn't work. Would have to call a script on first boot or something) -# gsettings set org.gnome.desktop.background picture-uri file://mnt/sysimage/usr/share/backgrounds/elementary/default - ## Append lines to existing vendor.conf file, so that options are skipped upon reboot cat >> /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf<< EOF [pages] diff --git a/blocks/nano.cfg b/blocks/nano.cfg index 49b4463..2143e7f 100644 --- a/blocks/nano.cfg +++ b/blocks/nano.cfg @@ -15,7 +15,7 @@ %include base-fedora-repo.cfg # offical repositories for Fedora %include base-storage.cfg # base storage -%include nano.cfg # A base system +%include base-nano.cfg # A base system firstboot --enable --reconfig # Initial Setup will start after the first reboot reboot --kexec # Reboot straight into the system after a successfull installation