From de556053c389dbf3ee907a545b730180f70065ea Mon Sep 17 00:00:00 2001 From: Lukas Date: Fri, 26 Nov 2021 16:13:00 +0100 Subject: [PATCH] rename files --- .../{bhla.cfg => base-live-hypervisor-a.cfg} | 3 - .../{bhli.cfg => base-live-hypervisor-ii.cfg} | 3 - .../{bhl.cfg => base-live-hypervisor.cfg} | 3 - blocks-live/{bl.cfg => base-live.cfg} | 3 - ...ldha.cfg => live-desktop-hypervisor-a.cfg} | 0 ...dhi.cfg => live-desktop-hypervisor-ii.cfg} | 0 .../{ldh.cfg => live-desktop-hypervisor.cfg} | 0 blocks-live/{ld.cfg => live-desktop.cfg} | 0 ...{lsha.cfg => live-server-hypervisor-a.cfg} | 1 - ...lshi.cfg => live-server-hypervisor-ii.cfg} | 0 .../{lsh.cfg => live-server-hypervisor.cfg} | 1 - blocks-live/{ls.cfg => live-server.cfg} | 1 - blocks/{bd.cfg => base-desktop-gnome.cfg} | 3 - blocks/base-fedora-repo.cfg | 13 ++++ blocks/base-guest-agents.cfg | 11 ++++ blocks/{bha.cfg => base-hypervisor-a.cfg} | 3 - blocks/{bhi.cfg => base-hypervisor-ii.cfg} | 3 - blocks/{bh.cfg => base-hypervisor.cfg} | 3 - blocks/{bnd.cfg => base-nano.cfg} | 24 +------ blocks/base-storage.cfg | 13 ++++ blocks/{b.cfg => base.cfg} | 15 ----- blocks/{dha.cfg => desktop-hypervisor-a.cfg} | 24 ++++--- blocks/{dhi.cfg => desktop-hypervisor-ii.cfg} | 18 +++-- blocks/{dh.cfg => desktop-hypervisor.cfg} | 22 ++++--- blocks/{d.cfg => desktop.cfg} | 22 ++++--- blocks/n.cfg | 20 ------ blocks/nano.cfg | 27 ++++++++ blocks/{sha.cfg => server-hypervisor-a.cfg} | 11 ++-- blocks/{shi.cfg => server-hypervisor-ii.cfg} | 13 ++-- blocks/{sh.cfg => server-hypervisor.cfg} | 9 +-- blocks/{s.cfg => server.cfg} | 9 +-- leaves/flat-server.cfg | 65 +++++++++++++++++++ 32 files changed, 204 insertions(+), 139 deletions(-) rename blocks-live/{bhla.cfg => base-live-hypervisor-a.cfg} (92%) rename blocks-live/{bhli.cfg => base-live-hypervisor-ii.cfg} (93%) rename blocks-live/{bhl.cfg => base-live-hypervisor.cfg} (96%) rename blocks-live/{bl.cfg => base-live.cfg} (99%) rename blocks-live/{ldha.cfg => live-desktop-hypervisor-a.cfg} (100%) rename blocks-live/{ldhi.cfg => live-desktop-hypervisor-ii.cfg} (100%) rename blocks-live/{ldh.cfg => live-desktop-hypervisor.cfg} (100%) rename blocks-live/{ld.cfg => live-desktop.cfg} (100%) rename blocks-live/{lsha.cfg => live-server-hypervisor-a.cfg} (89%) rename blocks-live/{lshi.cfg => live-server-hypervisor-ii.cfg} (100%) rename blocks-live/{lsh.cfg => live-server-hypervisor.cfg} (90%) rename blocks-live/{ls.cfg => live-server.cfg} (94%) rename blocks/{bd.cfg => base-desktop-gnome.cfg} (92%) create mode 100644 blocks/base-fedora-repo.cfg create mode 100644 blocks/base-guest-agents.cfg rename blocks/{bha.cfg => base-hypervisor-a.cfg} (92%) rename blocks/{bhi.cfg => base-hypervisor-ii.cfg} (93%) rename blocks/{bh.cfg => base-hypervisor.cfg} (96%) rename blocks/{bnd.cfg => base-nano.cfg} (61%) create mode 100644 blocks/base-storage.cfg rename blocks/{b.cfg => base.cfg} (62%) rename blocks/{dha.cfg => desktop-hypervisor-a.cfg} (70%) rename blocks/{dhi.cfg => desktop-hypervisor-ii.cfg} (76%) rename blocks/{dh.cfg => desktop-hypervisor.cfg} (72%) rename blocks/{d.cfg => desktop.cfg} (70%) delete mode 100644 blocks/n.cfg create mode 100644 blocks/nano.cfg rename blocks/{sha.cfg => server-hypervisor-a.cfg} (73%) rename blocks/{shi.cfg => server-hypervisor-ii.cfg} (67%) rename blocks/{sh.cfg => server-hypervisor.cfg} (77%) rename blocks/{s.cfg => server.cfg} (73%) create mode 100644 leaves/flat-server.cfg diff --git a/blocks-live/bhla.cfg b/blocks-live/base-live-hypervisor-a.cfg similarity index 92% rename from blocks-live/bhla.cfg rename to blocks-live/base-live-hypervisor-a.cfg index 37560e5..f38b6e8 100644 --- a/blocks-live/bhla.cfg +++ b/blocks-live/base-live-hypervisor-a.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file configures an hypervisor for AMD (tm) CPUs -# 'b' for basic building block, 'h' for hypervisor', 'a' for amd - -# This is NOT a standalone kickstart file %post --log=/root/bhla.log # Beginning of %post section. Those commands are executed inside the chroot environment. Logging is enabled to help with post-installation troubleshooting diff --git a/blocks-live/bhli.cfg b/blocks-live/base-live-hypervisor-ii.cfg similarity index 93% rename from blocks-live/bhli.cfg rename to blocks-live/base-live-hypervisor-ii.cfg index 79d86c2..cddba12 100644 --- a/blocks-live/bhli.cfg +++ b/blocks-live/base-live-hypervisor-ii.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file configures an hypervisor for Intel(tm) CPUs and Intel(tm) graphic cards -# 'b' for basic building block, 'h' for hypervisor', 'i' for intel - -# This is NOT a standalone kickstart file %post --log=/root/blhi.log # Beginning of %post section. Those commands are executed inside the chroot environment. Logging is enabled to help with post-installtion troubleshooting diff --git a/blocks-live/bhl.cfg b/blocks-live/base-live-hypervisor.cfg similarity index 96% rename from blocks-live/bhl.cfg rename to blocks-live/base-live-hypervisor.cfg index 1621982..7eb8a55 100644 --- a/blocks-live/bhl.cfg +++ b/blocks-live/base-live-hypervisor.cfg @@ -7,9 +7,6 @@ # /_/ /____/ # What ? This kickstart file provides a basic, generic building block to build a virtualization host. -# 'b' for basic building block, 'h' for hypervisor' - -# This is NOT a standalone kickstart file %packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies. diff --git a/blocks-live/bl.cfg b/blocks-live/base-live.cfg similarity index 99% rename from blocks-live/bl.cfg rename to blocks-live/base-live.cfg index e676886..0b1b7c5 100644 --- a/blocks-live/bl.cfg +++ b/blocks-live/base-live.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file provides a basic block to build a minimal, live system -# 'b' for basic building block, 'l' for live - -# This is NOT a standalone kickstart file # text # Perform installation in text mode diff --git a/blocks-live/ldha.cfg b/blocks-live/live-desktop-hypervisor-a.cfg similarity index 100% rename from blocks-live/ldha.cfg rename to blocks-live/live-desktop-hypervisor-a.cfg diff --git a/blocks-live/ldhi.cfg b/blocks-live/live-desktop-hypervisor-ii.cfg similarity index 100% rename from blocks-live/ldhi.cfg rename to blocks-live/live-desktop-hypervisor-ii.cfg diff --git a/blocks-live/ldh.cfg b/blocks-live/live-desktop-hypervisor.cfg similarity index 100% rename from blocks-live/ldh.cfg rename to blocks-live/live-desktop-hypervisor.cfg diff --git a/blocks-live/ld.cfg b/blocks-live/live-desktop.cfg similarity index 100% rename from blocks-live/ld.cfg rename to blocks-live/live-desktop.cfg diff --git a/blocks-live/lsha.cfg b/blocks-live/live-server-hypervisor-a.cfg similarity index 89% rename from blocks-live/lsha.cfg rename to blocks-live/live-server-hypervisor-a.cfg index ca5cc28..24213c7 100644 --- a/blocks-live/lsha.cfg +++ b/blocks-live/live-server-hypervisor-a.cfg @@ -6,4 +6,3 @@ # /_/ /____/ # 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 AMD (tm) CPUs -# 'l' for live, 's' for server, 'h' for hypervisor', 'a' for amd \ No newline at end of file diff --git a/blocks-live/lshi.cfg b/blocks-live/live-server-hypervisor-ii.cfg similarity index 100% rename from blocks-live/lshi.cfg rename to blocks-live/live-server-hypervisor-ii.cfg diff --git a/blocks-live/lsh.cfg b/blocks-live/live-server-hypervisor.cfg similarity index 90% rename from blocks-live/lsh.cfg rename to blocks-live/live-server-hypervisor.cfg index 83adb82..45755b3 100644 --- a/blocks-live/lsh.cfg +++ b/blocks-live/live-server-hypervisor.cfg @@ -6,4 +6,3 @@ # /_/ /____/ # 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 -# 'l' for live, 's' for server, 'h' for hypervisor' \ No newline at end of file diff --git a/blocks-live/ls.cfg b/blocks-live/live-server.cfg similarity index 94% rename from blocks-live/ls.cfg rename to blocks-live/live-server.cfg index 061a9c7..ee82a4c 100644 --- a/blocks-live/ls.cfg +++ b/blocks-live/live-server.cfg @@ -6,4 +6,3 @@ # /_/ /____/ # What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented live system. -# 'l' for live, 's' for server \ No newline at end of file diff --git a/blocks/bd.cfg b/blocks/base-desktop-gnome.cfg similarity index 92% rename from blocks/bd.cfg rename to blocks/base-desktop-gnome.cfg index d0892a3..a3caa8c 100644 --- a/blocks/bd.cfg +++ b/blocks/base-desktop-gnome.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file provides a basic block to build a minimal, desktop-oriented operating system using GNOME Shell. -# 'b' for basic building block, 'd' for desktop - -# This is NOT a standalone kickstart file xconfig --startxonboot --defaultdesktop=GNOME # Start the display session on boot. Although it says --startx, which seems to imply xorg, it is actually generic and thus works also with Wayland. diff --git a/blocks/base-fedora-repo.cfg b/blocks/base-fedora-repo.cfg new file mode 100644 index 0000000..3bada05 --- /dev/null +++ b/blocks/base-fedora-repo.cfg @@ -0,0 +1,13 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# What ? This kickstart file provides a the Fedora official repositories + +# Official Fedora repositories +repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror +repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror +url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror \ No newline at end of file diff --git a/blocks/base-guest-agents.cfg b/blocks/base-guest-agents.cfg new file mode 100644 index 0000000..3268762 --- /dev/null +++ b/blocks/base-guest-agents.cfg @@ -0,0 +1,11 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# What ? This kickstart file provides guest-agents, which are useful for virtual machines + +qemu-guest-agent # "QEMU guest agent" The qemu-guest agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine +spice-vdagent # "Agent for Spice guests" The spice agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine \ No newline at end of file diff --git a/blocks/bha.cfg b/blocks/base-hypervisor-a.cfg similarity index 92% rename from blocks/bha.cfg rename to blocks/base-hypervisor-a.cfg index 298bfd2..83dfc68 100644 --- a/blocks/bha.cfg +++ b/blocks/base-hypervisor-a.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file configures an hypervisor for AMD (tm) CPUs -# 'b' for basic building block, 'h' for hypervisor', 'a' for amd - -# This is NOT a standalone kickstart file %post --nochroot --log=/mnt/sysimage/root/bha.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installation troubleshooting diff --git a/blocks/bhi.cfg b/blocks/base-hypervisor-ii.cfg similarity index 93% rename from blocks/bhi.cfg rename to blocks/base-hypervisor-ii.cfg index 417e039..cbe8b43 100644 --- a/blocks/bhi.cfg +++ b/blocks/base-hypervisor-ii.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file configures an hypervisor for Intel(tm) CPUs and Intel(tm) graphic cards -# 'b' for basic building block, 'h' for hypervisor', 'i' for intel - -# This is NOT a standalone kickstart file %post --nochroot --log=/mnt/sysimage/root/bhi.log # Beginning of %post section. Those commands are executed outside the chroot environment. Logging is enabled to help with post-installtion troubleshooting diff --git a/blocks/bh.cfg b/blocks/base-hypervisor.cfg similarity index 96% rename from blocks/bh.cfg rename to blocks/base-hypervisor.cfg index 6c2c650..28667d4 100644 --- a/blocks/bh.cfg +++ b/blocks/base-hypervisor.cfg @@ -6,9 +6,6 @@ # /_/ /____/ # What ? This kickstart file provides a basic, generic building block to build a virtualization host. -# 'b' for basic building block, 'h' for hypervisor' - -# This is NOT a standalone kickstart file %packages --exclude-weakdeps # Beginning of the packages section. Does not include weak dependencies. diff --git a/blocks/bnd.cfg b/blocks/base-nano.cfg similarity index 61% rename from blocks/bnd.cfg rename to blocks/base-nano.cfg index 771a778..0283d18 100644 --- a/blocks/bnd.cfg +++ b/blocks/base-nano.cfg @@ -5,24 +5,10 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file itents to provide a basic block small than the minimal operating system. -# 'b' for basic building block, 'n' for nano, 'd' for development only. +# What ? This kickstart file intends to provide a basic block smaller than the minimal operating system. -# This is NOT a standalone kickstart file. - -# ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye - -# NOTE : it currently fails - -# cmdline # Perform the full installation in real text mode see here https://wiki.centos.org/TipsAndTricks/KickStart text # Perform installation in text mode -# Installation method. For cdrom, replace repo and url with cdrom -repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror -repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror -url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror - keyboard --xlayouts='ch (fr)' # set keyboard layouts for Romandie lang en_US.UTF-8 # Set system language to American English. More languages could be supported: --addsupport=cs_CZ,de_DE,en_UK timezone Europe/Paris --utc # Set system timezone to Paris @@ -35,14 +21,6 @@ services --enabled=NetworkManager,libvirtd --disabled=sshd network --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network interfaces and set hostname. "link" selects the first device reaching an up state zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record -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 GNU GRUB bootloader timeout to 1. - -# reboot --kexec # Reboot the system after the installation is successfully completed -# firstboot --enable --reconfig # Initial Setup will start after the first reboot %packages --excludedocs --nocore --exclude-weakdeps diff --git a/blocks/base-storage.cfg b/blocks/base-storage.cfg new file mode 100644 index 0000000..6290ca2 --- /dev/null +++ b/blocks/base-storage.cfg @@ -0,0 +1,13 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# What ? This kickstart file provides a basic EXT4 layout for EFI, without encryption. + +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 GNU GRUB bootloader timeout to 1. \ No newline at end of file diff --git a/blocks/b.cfg b/blocks/base.cfg similarity index 62% rename from blocks/b.cfg rename to blocks/base.cfg index 097ca79..f1f7f82 100644 --- a/blocks/b.cfg +++ b/blocks/base.cfg @@ -6,17 +6,9 @@ # /_/ /____/ # # What ? This kickstart file provides a basic block to build a minimal operating system. -# 'b' for basic building block - -# This is NOT a standalone kickstart file text # Perform installation in text mode -# Installation method. For cdrom, replace repo and url with cdrom -repo --name=fedora --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora mirror -repo --name=updates --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch # Official Fedora updates mirror -url --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch # Official Fedora updates mirror - keyboard --xlayouts='ch (fr)' # set keyboard layouts for Romandie lang en_US.UTF-8 # Set system language to American English. More languages could be supported: --addsupport=cs_CZ,de_DE,en_UK timezone Europe/Paris --utc # Set system timezone to Paris @@ -29,11 +21,6 @@ services --enabled=NetworkManager,libvirtd --disabled=sshd network --onboot=yes --bootproto=dhcp --device=link --activate --hostname=phyllome-alpha # Configure network interfaces and set hostname. "link" selects the first device reaching an up state zerombr # WARNING : Dangerous command ! Will clear the Master Boot Record -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 GNU GRUB bootloader timeout to 1. %packages --exclude-weakdeps # Beginning of the package section. Does not include weak dependencies. @@ -43,8 +30,6 @@ pciutils # Pciutils provides lspci commandline tool, which is not installed by d wget # "The non-interactive network downloader. " Used to fetch files during installation neofetch # a simple tool to show hardware-related informations inside a terminal nano # The nano text editor -qemu-guest-agent # "QEMU guest agent" The qemu-guest agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine -spice-vdagent # "Agent for Spice guests" The spice agent is unnecessary for a bare-metal system. However, it is included here to cover cases where this kickstart file is used to deploy a virtual machine -fedora-logos # Remove Fedora logos to comply with [Fedora Remix legal guidelines](https://fedoraproject.org/wiki/Remix) -fedora-release # Remove Fedora release-notes -fedora-release-notes # Remove Fedora release-notes diff --git a/blocks/dha.cfg b/blocks/desktop-hypervisor-a.cfg similarity index 70% rename from blocks/dha.cfg rename to blocks/desktop-hypervisor-a.cfg index fa186ae..f209a12 100644 --- a/blocks/dha.cfg +++ b/blocks/desktop-hypervisor-a.cfg @@ -6,19 +6,17 @@ # /_/ /____/ # What ? This kickstart file bootstraps a desktop hypervisor configured for AMD (tm) CPUs. -# 'd' for desktop, 'h' for hypervisor', 'a' for amd - -# ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye! # 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 dha.cfg -o ../leaves/flat-dha.cfg +# ksflatten -c desktop-hypervisor-a.cfg -o ../leaves/phyllome-desktop-a.cfg -%include b.cfg # A minimal machine -%include bd.cfg # A desktop environment -%include bh.cfg # A base hypervisor -%include bha.cfg # Specific virtualization configuration for AMD (tm) CPUs +%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-hypervisor.cfg # A base hypervisor +%include base-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs reboot --kexec # Reboot straight into the system after a successfull installation @@ -41,4 +39,12 @@ Name=Virtual Machine Manager Exec=virt-manager EOF +## 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] +skip=privacy +[goa] +providers=local-first! +EOF + %end # End of the %post section \ No newline at end of file diff --git a/blocks/dhi.cfg b/blocks/desktop-hypervisor-ii.cfg similarity index 76% rename from blocks/dhi.cfg rename to blocks/desktop-hypervisor-ii.cfg index 6587f78..12fb298 100644 --- a/blocks/dhi.cfg +++ b/blocks/desktop-hypervisor-ii.cfg @@ -5,20 +5,18 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU and Intel(tm) graphic cards. -# 'd' for desktop, 'h' for hypervisor', 'i' for intel - -# ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye! +# What ? This kickstart file bootstraps a desktop hypervisor configured for Intel(tm) CPU 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 dhi.cfg -o ../leaves/flat-dhi.cfg +# ksflatten -c desktop-hypervisor-ii.cfg -o ../leaves/phyllome-desktop-ii.cfg -%include b.cfg # A minimal machine -%include bd.cfg # A desktop environment -%include bh.cfg # A base hypervisor -%include bhi.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) graphic cards +%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-hypervisor.cfg # A base hypervisor +%include base-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) GPUs reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/dh.cfg b/blocks/desktop-hypervisor.cfg similarity index 72% rename from blocks/dh.cfg rename to blocks/desktop-hypervisor.cfg index a8be746..db1f8f3 100644 --- a/blocks/dh.cfg +++ b/blocks/desktop-hypervisor.cfg @@ -6,18 +6,16 @@ # /_/ /____/ # What ? This kickstart file bootstraps a desktop hypervisor. -# 'd' for desktop, 'h' for hypervisor - -# ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye! # 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 dh.cfg -o ../leaves/flat-dh.cfg +# ksflatten -c desktop-hypervisor.cfg -o ../leaves/phyllome-desktop.cfg -%include b.cfg # A minimal machine -%include bd.cfg # A desktop environment -%include bh.cfg # A base hypervisor +%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-hypervisor.cfg # A base hypervisor reboot --kexec # Reboot straight into the system after a successfull installation @@ -40,4 +38,12 @@ Name=Virtual Machine Manager Exec=virt-manager EOF +## 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] +skip=privacy +[goa] +providers=local-first! +EOF + %end # End of the %post section \ No newline at end of file diff --git a/blocks/d.cfg b/blocks/desktop.cfg similarity index 70% rename from blocks/d.cfg rename to blocks/desktop.cfg index 10cb883..8aec033 100644 --- a/blocks/d.cfg +++ b/blocks/desktop.cfg @@ -5,18 +5,16 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# What ? This kickstart file bootstraps a desktop machine. -# 'd' for desktop - -# ATTENTION : this kickstart file will automatically DESTROY the main disk and all of its contents. -# Bye bye! +# What ? This kickstart file bootstraps a desktop machine using GNOME Shell. # 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 d.cfg -o ../leaves/flat-d.cfg +# ksflatten -c desktop.cfg -o ../leaves/desktop.cfg -%include b.cfg # A base system -%include bd.cfg # A desktop environment +%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 reboot --kexec # Reboot straight into the system after a successfull installation @@ -33,4 +31,12 @@ truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove c # 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] +skip=privacy +[goa] +providers=local-first! +EOF + %end # End of the %post section \ No newline at end of file diff --git a/blocks/n.cfg b/blocks/n.cfg deleted file mode 100644 index 9f97c03..0000000 --- a/blocks/n.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# __ ____ ____ _____ -# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ -# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ -# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / -# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ -# /_/ /____/ - -# What ? This kickstart file itents to provide a basic block small than the minimal operating system. -# 'n' for nano, 'd' for development only. - -%include bnd.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 - -%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. - -initial-setup # Install the initial setup package. - -%end # End of the packages section \ No newline at end of file diff --git a/blocks/nano.cfg b/blocks/nano.cfg new file mode 100644 index 0000000..49b4463 --- /dev/null +++ b/blocks/nano.cfg @@ -0,0 +1,27 @@ +# __ ____ ____ _____ +# ____ / /_ __ __/ / /___ ____ ___ ___ / __ \/ ___/ +# / __ \/ __ \/ / / / / / __ \/ __ `__ \/ _ \ / / / /\__ \ +# / /_/ / / / / /_/ / / / /_/ / / / / / / __/ / /_/ /___/ / +# / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ +# /_/ /____/ + +# What ? This kickstart file itents to provide a basic block small than the minimal operating system. + +# NOTE: It currently fails + +# 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 nano.cfg -o ../leaves/nano-server-a.cfg + +%include base-fedora-repo.cfg # offical repositories for Fedora +%include base-storage.cfg # base storage +%include 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 + +%packages --exclude-weakdeps # Beginning of the packages section. Do not include weak dependencies. + +initial-setup # Install the initial setup package. + +%end # End of the packages section \ No newline at end of file diff --git a/blocks/sha.cfg b/blocks/server-hypervisor-a.cfg similarity index 73% rename from blocks/sha.cfg rename to blocks/server-hypervisor-a.cfg index 0b90eaa..4579633 100644 --- a/blocks/sha.cfg +++ b/blocks/server-hypervisor-a.cfg @@ -6,15 +6,16 @@ # /_/ /____/ # # What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented system with a hypervisor optimized for AMD (tm) CPUs -# 's' for server, '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 sha.cfg -o ../leaves/flat-sha.cfg +# ksflatten -c server-hypervisor-a.cfg -o ../leaves/phyllome-server-a.cfg -%include b.cfg # Include a base system -%include bh.cfg # A base hypervisor -%include bha.cfg # Specific virtualization tweaks for AMD (tm) CPUs +%include base-fedora-repo.cfg # offical repositories for Fedora +%include base-storage.cfg # base storage +%include base.cfg # A minimal machine +%include base-hypervisor.cfg # A base hypervisor +%include base-hypervisor-a.cfg # Specific virtualization configuration for AMD (tm) CPUs firstboot --enable --reconfig # Initial Setup will start after the first reboot reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/shi.cfg b/blocks/server-hypervisor-ii.cfg similarity index 67% rename from blocks/shi.cfg rename to blocks/server-hypervisor-ii.cfg index 731c763..3b45644 100644 --- a/blocks/shi.cfg +++ b/blocks/server-hypervisor-ii.cfg @@ -5,16 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ # -# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented system with a hypervisor optimized for Intel (tm) CPUs -# 's' for server, 'h' for hypervisor', 'i' for intel +# What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented system with a hypervisor optimized 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 shi.cfg -o ../leaves/flat-shi.cfg +# ksflatten -c server-hypervisor-ii.cfg -o ../leaves/phyllome-server-ii.cfg -%include b.cfg # Include a base system -%include bh.cfg # A base hypervisor -%include bhi.cfg # Specific virtualization tweaks for Intel(tm) CPU and Intel(tm) graphic cards +%include base-fedora-repo.cfg # offical repositories for Fedora +%include base-storage.cfg # base storage +%include base.cfg # A minimal machine +%include base-hypervisor.cfg # A base hypervisor +%include base-hypervisor-ii.cfg # Specific virtualization configuration for Intel(tm) CPU and Intel(tm) GPUs firstboot --enable --reconfig # Initial Setup will start after the first reboot reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/sh.cfg b/blocks/server-hypervisor.cfg similarity index 77% rename from blocks/sh.cfg rename to blocks/server-hypervisor.cfg index fea55da..2b54354 100644 --- a/blocks/sh.cfg +++ b/blocks/server-hypervisor.cfg @@ -6,14 +6,15 @@ # /_/ /____/ # # What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented system with a hypervisor. -# 's' for server, 'h' for hypervisor # 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 sh.cfg -o ../leaves/flat-sh.cfg +# ksflatten -c server-hypervisor.cfg -o ../leaves/phyllome-server.cfg -%include b.cfg # A base system -%include bh.cfg # A base hypervisor +%include base-fedora-repo.cfg # offical repositories for Fedora +%include base-storage.cfg # base storage +%include base.cfg # A minimal machine +%include base-hypervisor.cfg # A base hypervisor firstboot --enable --reconfig # Initial Setup will start after the first reboot reboot --kexec # Reboot straight into the system after a successfull installation diff --git a/blocks/s.cfg b/blocks/server.cfg similarity index 73% rename from blocks/s.cfg rename to blocks/server.cfg index bce7133..ab2ec92 100644 --- a/blocks/s.cfg +++ b/blocks/server.cfg @@ -6,13 +6,14 @@ # /_/ /____/ # # What ? When flattened, this file will result in a stand-alone kickstart file that can be automatically deploy into a server-oriented system. -# 's' for server -# In order to be fed to virt-install or software like livecd-creator, this file needs to be flatten or merged into one. +# In order to be fed to virt-install or a software like livecd-creator, this file needs to be flattened. # Here is how you can do it with the ksflatten tool provided by the pykickstart package on Fedora : -# ksflatten -c s.cfg -o ../leaves/flat-s.cfg +# ksflatten -c server.cfg -o ../leaves/flat-server.cfg -%include b.cfg # A base system +%include base-fedora-repo.cfg # offical repositories for Fedora +%include base-storage.cfg # base storage +%include base.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 diff --git a/leaves/flat-server.cfg b/leaves/flat-server.cfg new file mode 100644 index 0000000..2c47399 --- /dev/null +++ b/leaves/flat-server.cfg @@ -0,0 +1,65 @@ +# Generated by pykickstart v3.34 +#version=DEVEL +# Keyboard layouts +keyboard --xlayouts='ch (fr)' +# Root password +rootpw --iscrypted --lock locked +# System language +lang en_US.UTF-8 +# Reboot after installation +reboot --kexec +# Use text mode install +text +# Network information +network --bootproto=dhcp --device=link --hostname=phyllome-alpha --activate +# Firewall configuration +firewall --enabled --service=mdns +# Use network installation +url --mirrorlist="https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch" +repo --name="fedora" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch +repo --name="updates" --mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch +# System timezone +timezone Europe/Paris --utc +# Run the Setup Agent on first boot +firstboot --reconfig +# SELinux configuration +selinux --enforcing +# System services +services --disabled="sshd" --enabled="NetworkManager,libvirtd" +# System bootloader configuration +bootloader --location=mbr --timeout=1 +# Clear the Master Boot Record +zerombr +# Disk partitioning information +part /boot/efi --fstype="efi" --size=128 --fsoptions="umask=0077,shortname=winnt" --label=efi +part /boot --fstype="ext4" --size=384 --label=boot +part / --fstype="ext4" --grow --label=root + +%post --logfile=/root/b.log + +localectl set-keymap ch-fr # Set keymap to `ch-fr`. Alternatively, `us` can be picked. +dnf update -y # Update the system +grub2-mkconfig -o /boot/grub2/grub.cfg # Update grub otherwise the system won't boot properly + +%end + +%packages --exclude-weakdeps +@core +@hardware-support +fedora-remix-logos +generic-logos +generic-release +generic-release-common +generic-release-notes +initial-setup +nano +neofetch +pciutils +wget +-fedora-logos +-fedora-release +-fedora-release-common +-fedora-release-identity-basic +-fedora-release-notes + +%end