From 78b59364632e552d858939b5d491670156c78178 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sun, 15 May 2022 08:47:38 -0700 Subject: [PATCH] fix up ks --- Rocky-8-KDE.ks | 2 +- live/8/prod/rocky-live-kde-base.ks | 13 ++++++++++++- live/8/prod/rocky-live-kde.ks | 2 +- live/8/prod/rocky-live-xfce.ks | 19 ++++++++++++++----- live/8/stage/rocky-live-kde-base.ks | 13 ++++++++++++- live/8/stage/rocky-live-xfce.ks | 19 ++++++++++++++----- 6 files changed, 54 insertions(+), 14 deletions(-) diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks index cc0627a..9428cf3 100644 --- a/Rocky-8-KDE.ks +++ b/Rocky-8-KDE.ks @@ -36,7 +36,7 @@ zerombr clearpart --all # Disk partitioning information part / --fstype="ext4" --size=5120 -part / --size=7000 +part / --size=7300 %post # FIXME: it'd be better to get this installed from a package diff --git a/live/8/prod/rocky-live-kde-base.ks b/live/8/prod/rocky-live-kde-base.ks index d08bff5..44cd32d 100644 --- a/live/8/prod/rocky-live-kde-base.ks +++ b/live/8/prod/rocky-live-kde-base.ks @@ -61,6 +61,12 @@ chmod +x /usr/share/applications/liveinst.desktop mkdir /home/liveuser/Desktop cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ +if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/ +fi + # Set akonadi backend mkdir -p /home/liveuser/.config/akonadi cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF @@ -68,6 +74,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF Driver=QSQLITE3 AKONADI_EOF +# Disable plasma-pk-updates if applicable +rpm -e plasma-pk-updates + # "Disable plasma-discover-notifier" mkdir -p /home/liveuser/.config/autostart cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ @@ -79,6 +88,8 @@ cat > /home/liveuser/.config/baloofilerc << BALOO_EOF Indexing-Enabled=false BALOO_EOF +mkdir -p ~liveuser/.kde/share/config/ + # Disable kres-migrator cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF [Migration] @@ -98,7 +109,7 @@ restorecon -R / EOF -systemctl enable sddm.service +systemctl enable --force sddm.service dnf config-manager --set-enabled powertools %end diff --git a/live/8/prod/rocky-live-kde.ks b/live/8/prod/rocky-live-kde.ks index 457cac8..bda9103 100644 --- a/live/8/prod/rocky-live-kde.ks +++ b/live/8/prod/rocky-live-kde.ks @@ -4,7 +4,7 @@ %include rocky-live-kde-base.ks # DVD -part / --size=7000 +part / --size=7300 %post %end diff --git a/live/8/prod/rocky-live-xfce.ks b/live/8/prod/rocky-live-xfce.ks index 641673b..a8c89f7 100644 --- a/live/8/prod/rocky-live-xfce.ks +++ b/live/8/prod/rocky-live-xfce.ks @@ -21,7 +21,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF mkdir -p /home/liveuser/.config/xfce4 # ugly stuff, this should give us a default background for now mkdir -p /usr/share/backgrounds/images -ln -s ln -s /usr/share/backgrounds/f32/default/f32.png \ +ln -s /usr/share/backgrounds/f32/default/f32.png \ /usr/share/backgrounds/images/default.png cat > /home/liveuser/.config/xfce4/helpers.rc << FOE @@ -57,12 +57,12 @@ cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-per # set up autologin for user liveuser if [ -f /etc/sddm.conf ]; then sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=xfce/" /etc/sddm.conf +sed -i "s/^#Session=.*/Session=xfce.desktop/" /etc/sddm.conf else cat > /etc/sddm.conf << SDDM_EOF [Autologin] User=liveuser -Session=xfce +Session=xfce.desktop SDDM_EOF fi @@ -76,7 +76,13 @@ fi # 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 +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ + +if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/ +fi # no updater applet in live environment rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop @@ -84,6 +90,9 @@ rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop # and mark it as executable (new Xfce security feature) chmod +x /home/liveuser/Desktop/liveinst.desktop +# move to anaconda - probably not required for XFCE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + # this goes at the end after all other changes. chown -R liveuser:liveuser /home/liveuser restorecon -R /home/liveuser @@ -91,7 +100,7 @@ restorecon -R /home/liveuser EOF # this doesn't come up automatically. not sure why. -systemctl enable sddm.service +systemctl enable --force sddm.service dnf config-manager --set-enabled powertools %end diff --git a/live/8/stage/rocky-live-kde-base.ks b/live/8/stage/rocky-live-kde-base.ks index d08bff5..44cd32d 100644 --- a/live/8/stage/rocky-live-kde-base.ks +++ b/live/8/stage/rocky-live-kde-base.ks @@ -61,6 +61,12 @@ chmod +x /usr/share/applications/liveinst.desktop mkdir /home/liveuser/Desktop cp -a /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ +if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/ +fi + # Set akonadi backend mkdir -p /home/liveuser/.config/akonadi cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF @@ -68,6 +74,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF Driver=QSQLITE3 AKONADI_EOF +# Disable plasma-pk-updates if applicable +rpm -e plasma-pk-updates + # "Disable plasma-discover-notifier" mkdir -p /home/liveuser/.config/autostart cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /home/liveuser/.config/autostart/ @@ -79,6 +88,8 @@ cat > /home/liveuser/.config/baloofilerc << BALOO_EOF Indexing-Enabled=false BALOO_EOF +mkdir -p ~liveuser/.kde/share/config/ + # Disable kres-migrator cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF [Migration] @@ -98,7 +109,7 @@ restorecon -R / EOF -systemctl enable sddm.service +systemctl enable --force sddm.service dnf config-manager --set-enabled powertools %end diff --git a/live/8/stage/rocky-live-xfce.ks b/live/8/stage/rocky-live-xfce.ks index 641673b..a8c89f7 100644 --- a/live/8/stage/rocky-live-xfce.ks +++ b/live/8/stage/rocky-live-xfce.ks @@ -21,7 +21,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF mkdir -p /home/liveuser/.config/xfce4 # ugly stuff, this should give us a default background for now mkdir -p /usr/share/backgrounds/images -ln -s ln -s /usr/share/backgrounds/f32/default/f32.png \ +ln -s /usr/share/backgrounds/f32/default/f32.png \ /usr/share/backgrounds/images/default.png cat > /home/liveuser/.config/xfce4/helpers.rc << FOE @@ -57,12 +57,12 @@ cp /etc/xdg/xfce4/panel/default.xml /home/liveuser/.config/xfce4/xfconf/xfce-per # set up autologin for user liveuser if [ -f /etc/sddm.conf ]; then sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf -sed -i "s/^#Session=.*/Session=xfce/" /etc/sddm.conf +sed -i "s/^#Session=.*/Session=xfce.desktop/" /etc/sddm.conf else cat > /etc/sddm.conf << SDDM_EOF [Autologin] User=liveuser -Session=xfce +Session=xfce.desktop SDDM_EOF fi @@ -76,7 +76,13 @@ fi # 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 +cp /usr/share/applications/liveinst.desktop /home/liveuser/Desktop/ + +if [ -f /usr/share/anaconda/gnome/rhel-welcome.desktop ]; then + mkdir -p ~liveuser/.config/autostart + cp /usr/share/anaconda/gnome/rhel-welcome.desktop /usr/share/applications/ + cp /usr/share/anaconda/gnome/rhel-welcome.desktop ~liveuser/.config/autostart/ +fi # no updater applet in live environment rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop @@ -84,6 +90,9 @@ rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop # and mark it as executable (new Xfce security feature) chmod +x /home/liveuser/Desktop/liveinst.desktop +# move to anaconda - probably not required for XFCE. +mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop + # this goes at the end after all other changes. chown -R liveuser:liveuser /home/liveuser restorecon -R /home/liveuser @@ -91,7 +100,7 @@ restorecon -R /home/liveuser EOF # this doesn't come up automatically. not sure why. -systemctl enable sddm.service +systemctl enable --force sddm.service dnf config-manager --set-enabled powertools %end