Skip to content

Commit

Permalink
add anaconda steps into seperate shell
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Dec 19, 2024
1 parent ea2b260 commit da7d79f
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 32 deletions.
8 changes: 8 additions & 0 deletions katsu/modules/flagship/flagship-live-anaconda.sh
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions katsu/modules/flagship/flagship-live-anaconda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions katsu/modules/flagship/flagship-live.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions katsu/modules/gnome/gnome-live-anaconda.sh
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions katsu/modules/gnome/gnome-live-anaconda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions katsu/modules/gnome/gnome-live.sh
Original file line number Diff line number Diff line change
@@ -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
4 changes: 4 additions & 0 deletions katsu/modules/plasma/plasma-live-anaconda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
cat >>/var/lib/livesys/livesys-session-extra <<ALLEOF
# Install welcome screen
sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
ALLEOF
3 changes: 3 additions & 0 deletions katsu/modules/plasma/plasma-live-anaconda.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ scripts:
- id: plasma-live
name: Set up Plasma Live
file: ./plasma-live.sh
- id: plasma-live-anaconda
name: Set up Plasma Live (for Anaconda)
file: ./plasma-live-anaconda.sh

bootloader: grub

Expand Down
5 changes: 0 additions & 5 deletions katsu/modules/plasma/plasma-live.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,3 @@ EOF

# set livesys session type
sed -i 's/^livesys_session=.*/livesys_session="kde"/' /etc/sysconfig/livesys

cat >>/var/lib/livesys/livesys-session-extra <<ALLEOF
# Install welcome screen
sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
ALLEOF
14 changes: 0 additions & 14 deletions katsu/modules/xfce/xfce-live.sh

This file was deleted.

0 comments on commit da7d79f

Please sign in to comment.