From da7d79ff84e0a721b45736a8a74bfdd49f76ad3f Mon Sep 17 00:00:00 2001 From: Lleyton Gray Date: Wed, 18 Dec 2024 20:24:13 -0800 Subject: [PATCH] add anaconda steps into seperate shell --- katsu/modules/flagship/flagship-live-anaconda.sh | 8 ++++++++ katsu/modules/flagship/flagship-live-anaconda.yaml | 3 +++ katsu/modules/flagship/flagship-live.sh | 9 --------- katsu/modules/gnome/gnome-live-anaconda.sh | 3 +++ katsu/modules/gnome/gnome-live-anaconda.yaml | 3 +++ katsu/modules/gnome/gnome-live.sh | 5 +---- katsu/modules/plasma/plasma-live-anaconda.sh | 4 ++++ katsu/modules/plasma/plasma-live-anaconda.yaml | 3 +++ katsu/modules/plasma/plasma-live.sh | 5 ----- katsu/modules/xfce/xfce-live.sh | 14 -------------- 10 files changed, 25 insertions(+), 32 deletions(-) create mode 100644 katsu/modules/flagship/flagship-live-anaconda.sh create mode 100644 katsu/modules/gnome/gnome-live-anaconda.sh create mode 100644 katsu/modules/plasma/plasma-live-anaconda.sh delete mode 100644 katsu/modules/xfce/xfce-live.sh diff --git a/katsu/modules/flagship/flagship-live-anaconda.sh b/katsu/modules/flagship/flagship-live-anaconda.sh new file mode 100644 index 00000000..fbc51e37 --- /dev/null +++ b/katsu/modules/flagship/flagship-live-anaconda.sh @@ -0,0 +1,8 @@ +cat >> /var/lib/livesys/livesys-session-extra << EOF +# Update installer icon +sed -i -e 's/Icon=org.fedoraproject.AnacondaInstaller/Icon=drive-harddisk/' /usr/share/applications/liveinst.desktop +sed -i -e 's/Icon=org.fedoraproject.AnacondaInstaller/Icon=drive-harddisk/' /home/liveuser/Desktop/liveinst.desktop + +# allow anaconda to use system icon theme +sed -i -e 's/settings.set_property("gtk-icon-theme-name", "Adwaita")//' /usr/lib64/python3.12/site-packages/pyanaconda/ui/gui/__init__.py +EOF diff --git a/katsu/modules/flagship/flagship-live-anaconda.yaml b/katsu/modules/flagship/flagship-live-anaconda.yaml index 53ac93e8..98886142 100644 --- a/katsu/modules/flagship/flagship-live-anaconda.yaml +++ b/katsu/modules/flagship/flagship-live-anaconda.yaml @@ -22,6 +22,9 @@ scripts: - id: flagship-live name: Set up Flagship Live file: ./flagship-live.sh + - id: flagship-live-anaconda + name: Set up Flagship Live (for Anaconda) + file: ./flagship-live-anaconda.sh dnf: releasever: 41 diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh index 625bfd4d..a69e0078 100644 --- a/katsu/modules/flagship/flagship-live.sh +++ b/katsu/modules/flagship/flagship-live.sh @@ -2,12 +2,3 @@ # set livesys session type sed -i 's/^livesys_session=.*/livesys_session="budgie"/' /etc/sysconfig/livesys - -cat >> /var/lib/livesys/livesys-session-extra << EOF -# Update installer icon -sed -i -e 's/Icon=org.fedoraproject.AnacondaInstaller/Icon=drive-harddisk/' /usr/share/applications/liveinst.desktop -sed -i -e 's/Icon=org.fedoraproject.AnacondaInstaller/Icon=drive-harddisk/' /home/liveuser/Desktop/liveinst.desktop - -# allow anaconda to use system icon theme -sed -i -e 's/settings.set_property("gtk-icon-theme-name", "Adwaita")//' /usr/lib64/python3.12/site-packages/pyanaconda/ui/gui/__init__.py -EOF diff --git a/katsu/modules/gnome/gnome-live-anaconda.sh b/katsu/modules/gnome/gnome-live-anaconda.sh new file mode 100644 index 00000000..6b9a419e --- /dev/null +++ b/katsu/modules/gnome/gnome-live-anaconda.sh @@ -0,0 +1,3 @@ +sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome +sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop +sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop diff --git a/katsu/modules/gnome/gnome-live-anaconda.yaml b/katsu/modules/gnome/gnome-live-anaconda.yaml index 7859207b..c9aa90b4 100644 --- a/katsu/modules/gnome/gnome-live-anaconda.yaml +++ b/katsu/modules/gnome/gnome-live-anaconda.yaml @@ -22,6 +22,9 @@ scripts: - id: gnome-live name: Set up GNOME Live file: gnome-live.sh + - id: gnome-live-anaconda + name: Set up GNOME Live (for Anaconda) + file: gnome-live-anaconda.sh dnf: releasever: 41 diff --git a/katsu/modules/gnome/gnome-live.sh b/katsu/modules/gnome/gnome-live.sh index a28cf4f4..97c484f2 100644 --- a/katsu/modules/gnome/gnome-live.sh +++ b/katsu/modules/gnome/gnome-live.sh @@ -1,6 +1,3 @@ #!/bin/bash -x -# sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys -# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome -# sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop -# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop +sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys diff --git a/katsu/modules/plasma/plasma-live-anaconda.sh b/katsu/modules/plasma/plasma-live-anaconda.sh new file mode 100644 index 00000000..e61f9de4 --- /dev/null +++ b/katsu/modules/plasma/plasma-live-anaconda.sh @@ -0,0 +1,4 @@ +cat >>/var/lib/livesys/livesys-session-extra <>/var/lib/livesys/livesys-session-extra < /etc/sysconfig/desktop <>/var/lib/livesys/livesys-session-extra <