From 03aacd1818f24ff945f206ac580699b6b23cef11 Mon Sep 17 00:00:00 2001 From: Davide Cavalca Date: Fri, 30 Aug 2024 11:30:26 -0700 Subject: Add FEX-RootFS definition Add a new definition for a RootFS to be used by FEX (https://src.fedoraproject.org/rpms/fex-emu). This is based on the upstream manifest (https://github.com/FEX-Emu/RootFS/blob/main/Configs/Fedora_40.json). Signed-off-by: Alyssa Rosenzweig --- config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'config.sh') diff --git a/config.sh b/config.sh index 0f090d5..800247b 100755 --- a/config.sh +++ b/config.sh @@ -16,7 +16,7 @@ echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..." #====================================== # Set SELinux booleans #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then +if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then ## Fixes KDE Plasma, see rhbz#2058657 setsebool -P selinuxuser_execmod 1 fi @@ -33,7 +33,7 @@ rm -f /var/lib/systemd/random-seed #====================================== # Configure grub correctly #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then +if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then ## Works around issues with grub-bls ## See: https://github.com/OSInside/kiwi/issues/2198 echo "GRUB_DEFAULT=saved" >> /etc/default/grub @@ -111,7 +111,7 @@ fi #====================================== # Setup default target #-------------------------------------- -if [[ "$kiwi_profiles" != *"Container"* ]]; then +if [[ "$kiwi_profiles" != *"Container"* ]] && [[ "$kiwi_profiles" != *"FEX"* ]]; then if [[ "$kiwi_profiles" == *"Desktop"* ]]; then systemctl set-default graphical.target else @@ -192,7 +192,7 @@ chmod 600 /root/.ssh/authorized_keys chown -R root:root /root/.ssh fi -if [[ "$kiwi_profiles" == *"Container"* ]]; then +if [[ "$kiwi_profiles" == *"Container"* ]] || [[ "$kiwi_profiles" == *"FEX"* ]]; then # Set install langs macro so that new rpms that get installed will # only install langs that we limit it to. LANG="en_US" -- cgit v1.3.1+13