From 30ef6928bffe6e771937605745eadb2eadd81ed1 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 13 Jan 2024 16:56:47 -0500 Subject: [PATCH] components/desktop-environments, config.sh: Add SoaS variant This adds the basic configuration for Sugar on a Stick. --- components/desktop-environments.xml | 22 ++++++++++++++ config.sh | 45 +++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) diff --git a/components/desktop-environments.xml b/components/desktop-environments.xml index 3347545..dee059b 100644 --- a/components/desktop-environments.xml +++ b/components/desktop-environments.xml @@ -135,6 +135,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/config.sh b/config.sh index 7abd097..4508d9c 100755 --- a/config.sh +++ b/config.sh @@ -63,6 +63,9 @@ if [[ "$kiwi_profiles" == *"Live"* ]]; then if [[ "$kiwi_profiles" == *"KDE"* ]]; then echo 'livesys_session="kde"' > /etc/sysconfig/livesys fi + if [[ "$kiwi_profiles" == *"SoaS"* ]]; then + echo 'livesys_session="soas"' > /etc/sysconfig/livesys + fi fi #====================================== @@ -192,4 +195,46 @@ if [[ "$kiwi_profiles" == *"Container"* ]]; then fi fi +if [[ "$kiwi_profiles" == *"SoaS"* ]]; then +# Get proper release naming in the control panel +cat >> /boot/olpc_build << EOF +Sugar on a Stick +EOF +cat /etc/fedora-release >> /boot/olpc_build + +# Rebuild initrd for Sugar boot screen -- TODO: Switch to kiwi declarative stanza +KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n') +/usr/sbin/plymouth-set-default-theme sugar +sed -i -r 's/(omit_dracutmodules\+\=.*) plymouth (.*)/\1 \2/' /etc/dracut.conf.d/99-liveos.conf +dracut --force-add plymouth -N -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION + +# Note that running rpm recreates the rpm db files which aren't needed or wanted +rm -f /var/lib/rpm/__db* + +cat > /etc/sysconfig/desktop </usr/share/glib-2.0/schemas/sugar.soas.gschema.override <