From ad67199c3e462fdd0c3e95e3215137afbb091fb4 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Sun, 15 May 2022 08:43:03 -0700 Subject: [PATCH] fix up ks --- Rocky-8-KDE.ks | 15 +++++++++++++-- Rocky-8-Workstation-Lite.ks | 2 +- Rocky-8-Workstation.ks | 2 +- Rocky-8-XFCE.ks | 21 +++++++++++++++------ 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/Rocky-8-KDE.ks b/Rocky-8-KDE.ks index 4c904e5..cc0627a 100644 --- a/Rocky-8-KDE.ks +++ b/Rocky-8-KDE.ks @@ -379,7 +379,7 @@ FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/org MENU_EOF # show liveinst.desktop on desktop and in menu -#sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop +sed -i 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop # debrand #sed -i "s/Red Hat Enterprise/Rocky/g" /usr/share/anaconda/gnome/rhel-welcome.desktop @@ -393,6 +393,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 @@ -400,6 +406,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/ @@ -411,6 +420,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] @@ -430,7 +441,7 @@ restorecon -R / EOF -systemctl enable sddm.service +systemctl enable --force sddm.service dnf config-manager --set-enabled powertools %end diff --git a/Rocky-8-Workstation-Lite.ks b/Rocky-8-Workstation-Lite.ks index 6c756a7..91bb3f7 100644 --- a/Rocky-8-Workstation-Lite.ks +++ b/Rocky-8-Workstation-Lite.ks @@ -371,7 +371,7 @@ FOE # make the installer show up if [ -f /usr/share/applications/liveinst.desktop ]; then # Show harddisk install in shell dash - #sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" # need to move it to anaconda.desktop to make shell happy mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop diff --git a/Rocky-8-Workstation.ks b/Rocky-8-Workstation.ks index 57575be..579bfa6 100644 --- a/Rocky-8-Workstation.ks +++ b/Rocky-8-Workstation.ks @@ -371,7 +371,7 @@ FOE # make the installer show up if [ -f /usr/share/applications/liveinst.desktop ]; then # Show harddisk install in shell dash - #sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" + sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.desktop "" # need to move it to anaconda.desktop to make shell happy mv /usr/share/applications/liveinst.desktop /usr/share/applications/anaconda.desktop diff --git a/Rocky-8-XFCE.ks b/Rocky-8-XFCE.ks index d4c0737..5bf28b7 100644 --- a/Rocky-8-XFCE.ks +++ b/Rocky-8-XFCE.ks @@ -350,7 +350,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 @@ -386,12 +386,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 @@ -403,16 +403,25 @@ fi #sed -i "s/org.fedoraproject.AnacondaInstaller/fedora-logo-icon/g" /usr/share/applications/liveinst.desktop # Show harddisk install on the desktop -#sed -i -e 's/NoDisplay=true/NoDisplay=false/' /usr/share/applications/liveinst.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/ # no updater applet in live environment rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.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 + # 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 @@ -420,7 +429,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