aboutsummaryrefslogtreecommitdiff
path: root/config.sh
diff options
from:
to:
context:
space:
mode:
authorGravatar Davide Cavalca <dcavalca@fedoraproject.org> 2024-08-30 11:30:26 -0700
committerGravatar Davide Cavalca <dcavalca@fedoraproject.org> 2024-09-28 15:10:02 -0700
commit03aacd1818f24ff945f206ac580699b6b23cef11 (patch)
treeab592b4bf8af72050efa511af6d2c7dfd5ecf65f /config.sh
parent5fe8b10e986e41eec9cde4e0004c8ac28dc4b76c (diff)
downloadkiwi-descriptions-03aacd1818f24ff945f206ac580699b6b23cef11.tar.gz
kiwi-descriptions-03aacd1818f24ff945f206ac580699b6b23cef11.zip
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 <alyssa@rosenzweig.io>
Diffstat (limited to 'config.sh')
-rwxr-xr-xconfig.sh8
1 files changed, 4 insertions, 4 deletions
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"