diff --git a/dishes/virtual-desktop-hypervisor.cfg b/dishes/virtual-desktop-hypervisor.cfg index 027aa63..bf0081d 100644 --- a/dishes/virtual-desktop-hypervisor.cfg +++ b/dishes/virtual-desktop-hypervisor.cfg @@ -3,9 +3,7 @@ # Use text mode install text # Firewall configuration -firewall --disabled -# Run the Setup Agent on first boot -firstboot --reconfig +firewall --enabled --service=ssh # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -46,20 +44,6 @@ dnf update -y # Update the system %end -%post --nochroot --logfile=/mnt/sysimage/root/base-initial-setup-gnome.log - -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 - %post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome.log # cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF @@ -250,7 +234,6 @@ generic-release-notes glibc gnome-backgrounds.noarch gnome-control-center -gnome-initial-setup gnome-shell gnome-terminal hostname diff --git a/dishes/virtual-desktop.cfg b/dishes/virtual-desktop.cfg index d4b9b71..0e837e8 100644 --- a/dishes/virtual-desktop.cfg +++ b/dishes/virtual-desktop.cfg @@ -3,9 +3,7 @@ # Use text mode install text # Firewall configuration -firewall --disabled -# Run the Setup Agent on first boot -firstboot --reconfig +firewall --enabled --service=ssh # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -46,20 +44,6 @@ dnf update -y # Update the system %end -%post --nochroot --logfile=/mnt/sysimage/root/base-initial-setup-gnome.log - -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 - %post --nochroot --logfile=/mnt/sysimage/root/base-desktop-gnome.log # cat >> /mnt/sysimage/usr/share/glib-2.0/schemas/org.gnome.desktop.background.gschema.override<< EOF @@ -157,7 +141,6 @@ generic-release-notes glibc gnome-backgrounds.noarch gnome-control-center -gnome-initial-setup gnome-shell gnome-terminal hostname diff --git a/dishes/virtual-server-hypervisor.cfg b/dishes/virtual-server-hypervisor.cfg index 914e1d2..96ebdd1 100644 --- a/dishes/virtual-server-hypervisor.cfg +++ b/dishes/virtual-server-hypervisor.cfg @@ -3,9 +3,7 @@ # Use text mode install text # Firewall configuration -firewall --disabled -# Run the Setup Agent on first boot -firstboot --reconfig +firewall --enabled --service=ssh # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -98,7 +96,6 @@ generic-release-common generic-release-notes glibc hostname -initial-setup iproute iputils kbd diff --git a/dishes/virtual-server.cfg b/dishes/virtual-server.cfg index d3ea88c..cce3241 100644 --- a/dishes/virtual-server.cfg +++ b/dishes/virtual-server.cfg @@ -3,9 +3,7 @@ # Use text mode install text # Firewall configuration -firewall --disabled -# Run the Setup Agent on first boot -firstboot --reconfig +firewall --enabled --service=ssh # Keyboard layouts keyboard --xlayouts='ch (fr)' # System language @@ -68,7 +66,6 @@ generic-release-common generic-release-notes glibc hostname -initial-setup iproute iputils kbd diff --git a/recipes/virtual-desktop-hypervisor.cfg b/recipes/virtual-desktop-hypervisor.cfg index c0b9c36..d8b9271 100644 --- a/recipes/virtual-desktop-hypervisor.cfg +++ b/recipes/virtual-desktop-hypervisor.cfg @@ -5,20 +5,19 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for virtual desktop hypervisor +# Unsafe. Development-only. A recipe for a virtual desktop hypervisor %include ../ingredients/core.cfg # Text mode %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language -%include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux +%include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-desktop-virtual-machine-manager.cfg # Virtual Machine Manager %include ../ingredients/base-hypervisor.cfg # Base hypervisor diff --git a/recipes/virtual-desktop.cfg b/recipes/virtual-desktop.cfg index f6533ce..5fb875d 100644 --- a/recipes/virtual-desktop.cfg +++ b/recipes/virtual-desktop.cfg @@ -5,19 +5,18 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# Unsafe. Development-only. A recipe for a virtual desktop %include ../ingredients/core.cfg # Text mode %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language -%include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux +%include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-desktop.cfg # OEM setup for GNOME Shell %include ../ingredients/base-desktop-gnome.cfg # A GNOME Shell-based desktop environment %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file diff --git a/recipes/virtual-server-hypervisor.cfg b/recipes/virtual-server-hypervisor.cfg index eef471c..e76049e 100644 --- a/recipes/virtual-server-hypervisor.cfg +++ b/recipes/virtual-server-hypervisor.cfg @@ -5,19 +5,18 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual headless hypervisor +# # Unsafe. Development-only. A recipe for a virtual headless hypervisor %include ../ingredients/core.cfg # Text mode %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language -%include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux +%include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-server.cfg # For headless systems %include ../ingredients/base-hypervisor.cfg # Base hypervisor %include ../ingredients/base-guest-agents.cfg # Guest agents diff --git a/recipes/virtual-server.cfg b/recipes/virtual-server.cfg index 57c0a12..0d2e084 100644 --- a/recipes/virtual-server.cfg +++ b/recipes/virtual-server.cfg @@ -5,18 +5,17 @@ # / .___/_/ /_/\__, /_/_/\____/_/ /_/ /_/\___/ \____//____/ # /_/ /____/ -# A recipe for a virtual desktop +# # Unsafe. Development-only. A recipe for a virtual desktop %include ../ingredients/core.cfg # Text mode %include ../ingredients/core-storage.cfg # ext4-based storage configuration %include ../ingredients/core-bootloader-grub.cfg # Set bootloader to GRUB %include ../ingredients/core-locale.cfg # System locale set to Swiss French as keyboard layout and English as language -%include ../ingredients/core-security-off.cfg # Lock root account, disable firewall and SELinux +%include ../ingredients/core-security-off.cfg # Enable root account, disable firewall and SELinux %include ../ingredients/core-services.cfg # Required systemd services %include ../ingredients/core-network.cfg # Network configuration %include ../ingredients/core-packages-mandatory.cfg # Mandatory packages %include ../ingredients/core-packages-default.cfg # Default but not necessary packages %include ../ingredients/core-fedora-repo-43.cfg # Offical repositories for Fedora %include ../ingredients/core-post.cfg # Triggered after the installation -%include ../ingredients/core-initial-setup-server.cfg # For headless systems %include ../ingredients/base-guest-agents.cfg # Guest agents \ No newline at end of file