diff --git a/katsu/modules/flagship/flagship-live.sh b/katsu/modules/flagship/flagship-live.sh index e1503eba..59d1a4f9 100644 --- a/katsu/modules/flagship/flagship-live.sh +++ b/katsu/modules/flagship/flagship-live.sh @@ -33,19 +33,6 @@ chmod +x /home/liveuser/Desktop/liveinst.desktop # Install welcome screen sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome -# Install welcome screen autostart file -mkdir -p /home/liveuser/.config/autostart -cat > /home/liveuser/.config/autostart/ultramarine-welcome.desktop << EOA -[Desktop Entry] -Name=Welcome to Ultramarine -Comment=Welcome to Ultramarine -Exec=/usr/share/anaconda/gnome/fedora-welcome -Terminal=false -Type=Application -EOA - - - # allow anaconda to use system icon theme sed -i -e 's/settings.set_property("gtk-icon-theme-name", "Adwaita")//' /usr/lib64/python3.11/site-packages/pyanaconda/ui/gui/__init__.py diff --git a/katsu/modules/gnome/gnome-live.sh b/katsu/modules/gnome/gnome-live.sh new file mode 100644 index 00000000..92bdd4ff --- /dev/null +++ b/katsu/modules/gnome/gnome-live.sh @@ -0,0 +1,6 @@ +#!/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 diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml index 819236f1..2e64f8ba 100644 --- a/katsu/modules/gnome/gnome-live.yaml +++ b/katsu/modules/gnome/gnome-live.yaml @@ -4,6 +4,12 @@ import: - ../base/base.yaml - ../live/live.yaml +scripts: + post: + - id: gnome-live + name: Set up GNOME Live + file: gnome-live.sh + distro: Ultramarine GNOME 39 bootloader: grub diff --git a/katsu/modules/kde/kde-live.sh b/katsu/modules/kde/kde-live.sh new file mode 100644 index 00000000..5e5209f8 --- /dev/null +++ b/katsu/modules/kde/kde-live.sh @@ -0,0 +1,94 @@ +#!/bin/bash -x + +# set default GTK+ theme for root (see #683855, #689070, #808062) +cat >/root/.gtkrc-2.0 </root/.config/gtk-3.0/settings.ini <>/var/lib/livesys/livesys-session-extra < /etc/sddm.conf << SDDM_EOF +[Autologin] +User=liveuser +Session=\${PLASMA_SESSION_FILE} +SDDM_EOF +fi + +# add liveinst.desktop to favorites menu +mkdir -p /home/liveuser/.config/ +cat > /home/liveuser/.config/kickoffrc << MENU_EOF +[Favorites] +FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.dolphin.desktop,/usr/share/applications/systemsettings.desktop,/usr/share/applications/org.kde.konsole.desktop,/usr/share/applications/liveinst.desktop +MENU_EOF + +# show liveinst.desktop on desktop and in menu +sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +# set executable bit disable KDE security warning +chmod +x /usr/share/applications/liveinst.desktop +mkdir /home/liveuser/Desktop +cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ + +# Set akonadi backend +mkdir -p /home/liveuser/.config/akonadi +cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF +[%General] +Driver=QSQLITE3 +AKONADI_EOF + +# "Disable plasma-discover-notifier" +mkdir -p /home/liveuser/.config/autostart +cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ +echo 'Hidden=true' >> /home/liveuser/.config/autostart/org.kde.discover.notifier.desktop + +# Disable baloo +cat > /home/liveuser/.config/baloofilerc << BALOO_EOF +[Basic Settings] +Indexing-Enabled=false +BALOO_EOF + +# Disable kres-migrator +cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF +[Migration] +Enabled=false +KRES_EOF + +# Disable kwallet migrator +cat > /home/liveuser/.config/kwalletrc << KWALLET_EOL +[Migration] +alreadyMigrated=true +KWALLET_EOL + +# Disable automount of 'known' devices +# https://bugzilla.redhat.com/show_bug.cgi?id=2073708 +cat > /home/liveuser/.config/kded_device_automounterrc << AUTOMOUNTER_EOF +[General] +AutomountEnabled=false +AutomountOnLogin=false +AutomountOnPlugin=false +AUTOMOUNTER_EOF + +# make sure to set the right permissions and selinux contexts +chown -R liveuser:liveuser /home/liveuser/ +restorecon -R /home/liveuser/ + +ALLEOF diff --git a/katsu/modules/kde/kde-live.yaml b/katsu/modules/kde/kde-live.yaml index ccae8312..8bd0076e 100644 --- a/katsu/modules/kde/kde-live.yaml +++ b/katsu/modules/kde/kde-live.yaml @@ -6,6 +6,12 @@ import: distro: Ultramarine KDE 39 +scripts: + post: + - id: kde-live + name: Set up KDE Live + file: ./kde-live.sh + bootloader: grub kernel_cmdline: "quiet rhgb" diff --git a/katsu/modules/live/live.sh b/katsu/modules/live/live.sh index b499f12e..f7f15864 100644 --- a/katsu/modules/live/live.sh +++ b/katsu/modules/live/live.sh @@ -51,3 +51,20 @@ touch /etc/machine-id rm -f /core* systemctl set-default graphical.target + + +cat >> /var/lib/livesys/livesys-session-extra << EOF + +# Install welcome screen autostart file +mkdir -p /home/liveuser/.config/autostart +cat > /home/liveuser/.config/autostart/ultramarine-welcome.desktop << EOA +[Desktop Entry] +Name=Welcome to Ultramarine +Comment=Welcome to Ultramarine +Exec=/usr/share/anaconda/gnome/fedora-welcome +Terminal=false +Type=Application +EOA + + +EOF \ No newline at end of file diff --git a/katsu/modules/pantheon/pantheon-live.sh b/katsu/modules/pantheon/pantheon-live.sh new file mode 100644 index 00000000..45bbaefb --- /dev/null +++ b/katsu/modules/pantheon/pantheon-live.sh @@ -0,0 +1,39 @@ +#!/bin/bash -x + + +# create /etc/sysconfig/desktop (needed for installation) + +cat > /etc/sysconfig/desktop <> /var/lib/livesys/livesys-session-extra << EOF + +## set up lightdm autologin +sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf +sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf +# +# set Pantheon as default session, otherwise login will fail +sed -i 's/^#user-session=.*/user-session=pantheon/' /etc/lightdm/lightdm.conf + +# set the default wallpaper +gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/ultramarine-linux/39/foresty-skies-l.png +mkdir -p /home/liveuser/.local/share/applications + +# Show harddisk install on the desktop +sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +mkdir /home/liveuser/Desktop +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop + +# and mark it as executable +chmod +x /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.11/site-packages/pyanaconda/ui/gui/__init__.py + +# this goes at the end after all other changes. +chown -R liveuser:liveuser /home/liveuser +restorecon -R /home/liveuser + +EOF \ No newline at end of file diff --git a/katsu/modules/pantheon/pantheon-live.yaml b/katsu/modules/pantheon/pantheon-live.yaml index 45309bab..b9e6ff9a 100644 --- a/katsu/modules/pantheon/pantheon-live.yaml +++ b/katsu/modules/pantheon/pantheon-live.yaml @@ -4,6 +4,12 @@ import: - ../base/base.yaml - ../live/live.yaml +scripts: + post: + - id: pantheon-live + name: Set up Pantheon Live + file: ./pantheon-live.sh + distro: Ultramarine Pantheon 39 bootloader: grub