diff --git a/cook/ingredients/initial-setup/gnome/config.ks b/cook/ingredients/initial-setup/gnome/config.ks index 857860f..5e9be2a 100644 --- a/cook/ingredients/initial-setup/gnome/config.ks +++ b/cook/ingredients/initial-setup/gnome/config.ks @@ -10,16 +10,16 @@ gnome-initial-setup # Add GNOME initial setup too to let user create local accou %end # End of the packages section -# %post --nochroot --log=/mnt/sysimage/root/initial-setup-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. -# -# truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available -# -# ## 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 +%post --nochroot --log=/mnt/sysimage/root/initial-setup-gnome.log # Beginning of %post section. Those commands are executed outside the chroot environment. Add logging. + +truncate -s 0 /mnt/sysimage/usr/share/gnome-initial-setup/vendor.conf # remove content of vendor.conf so that all options are made available + +## 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 diff --git a/cook/ingredients/storage/biosboot.ks b/cook/ingredients/storage/biosboot.ks new file mode 100644 index 0000000..ddcdddc --- /dev/null +++ b/cook/ingredients/storage/biosboot.ks @@ -0,0 +1,8 @@ +# BIOS boot storage configuration (GPT disk label with a BIOS boot partition) + +zerombr # Destroy all the contents of disks with invalid partition tables or other formatting unrecognizable to the installer +clearpart --all --initlabel --disklabel=gpt # Erase all partitions, initialize a GPT disk label, and initialize the disk label to the default for the target architecture + +part biosboot --fstype="biosboot" --size=2 --label=biosboot # Creates a 2 MiB BIOS boot partition, required to install GRUB on a GPT-labelled disk under legacy BIOS firmware +part /boot --fstype="ext4" --size=2048 --label=boot # Creates a 2048 MiB ext4 boot partition +part / --fstype="ext4" --grow --label=root --mkfsoptions="-O encrypt,fast_commit" # Create a single root partition with the remaining space diff --git a/cook/recipe_templates.yaml b/cook/recipe_templates.yaml index 909af22..fb83e65 100644 --- a/cook/recipe_templates.yaml +++ b/cook/recipe_templates.yaml @@ -35,6 +35,7 @@ choices: storage: standard: storage/standard.ks encrypted: storage/encrypted.ks + biosboot: storage/biosboot.ks bootloader: grub: bootloader/grub.ks systemd-boot: bootloader/systemd-boot.ks @@ -60,6 +61,9 @@ features: - hypervisor/base/services.ks - hypervisor/base/post-scripts.ks desktop: + - hypervisor/base/packages.ks + - hypervisor/base/services.ks + - hypervisor/base/post-scripts.ks - packages/virtual-machine-manager/packages.ks - packages/virtual-machine-manager/post-scripts.ks hypervisor_type: diff --git a/cook/recipes_manifest.yaml b/cook/recipes_manifest.yaml index 945eb91..3cec6a2 100644 --- a/cook/recipes_manifest.yaml +++ b/cook/recipes_manifest.yaml @@ -46,15 +46,16 @@ recipes: guest-agents: false hypervisor: base hypervisor_type: intelcpu -# -# # Desktop-hypervisor variants -# - name: desktop-hypervisor -# variants: -# - repository: 43 -# desktop: gnome -# storage: standard -# bootloader: grub -# hardware-support: false -# guest-agents: true -# hypervisor: desktop -# hypervisor_type: ["amdcpu", "intelcpu"] \ No newline at end of file + # Desktop-hypervisor variants + - name: desktop-hypervisor + variants: + - repository: "44" + desktop: gnome + storage: biosboot + bootloader: grub + security: enabled + initial-setup: gnome + hardware-support: true + guest-agents: false + hypervisor: desktop + hypervisor_type: intelcpu \ No newline at end of file diff --git a/cook/tests/test_generator.py b/cook/tests/test_generator.py index 1771bb7..6e490ef 100644 --- a/cook/tests/test_generator.py +++ b/cook/tests/test_generator.py @@ -20,7 +20,7 @@ BASE_FRAGMENTS = [ "core/locale.ks", "core/network.ks", "core/services.ks", - "packages/core.ks", + "packages/core-explicit.ks", "packages/fedora-remix.ks", "packages/hand-picked.ks", ]