fix up ks

This commit is contained in:
nazunalika 2022-05-15 08:47:38 -07:00
parent ad67199c3e
commit 78b5936463
Signed by: label
GPG Key ID: 6735C0E1BD65D048
6 changed files with 54 additions and 14 deletions

View File

@ -36,7 +36,7 @@ zerombr
clearpart --all clearpart --all
# Disk partitioning information # Disk partitioning information
part / --fstype="ext4" --size=5120 part / --fstype="ext4" --size=5120
part / --size=7000 part / --size=7300
%post %post
# FIXME: it'd be better to get this installed from a package # FIXME: it'd be better to get this installed from a package

View File

@ -61,6 +61,12 @@ chmod +x /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop mkdir /home/liveuser/Desktop
cp -a /usr/share/applications/liveinst.desktop /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 # Set akonadi backend
mkdir -p /home/liveuser/.config/akonadi mkdir -p /home/liveuser/.config/akonadi
cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
@ -68,6 +74,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
Driver=QSQLITE3 Driver=QSQLITE3
AKONADI_EOF AKONADI_EOF
# Disable plasma-pk-updates if applicable
rpm -e plasma-pk-updates
# "Disable plasma-discover-notifier" # "Disable plasma-discover-notifier"
mkdir -p /home/liveuser/.config/autostart mkdir -p /home/liveuser/.config/autostart
cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /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 Indexing-Enabled=false
BALOO_EOF BALOO_EOF
mkdir -p ~liveuser/.kde/share/config/
# Disable kres-migrator # Disable kres-migrator
cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
[Migration] [Migration]
@ -98,7 +109,7 @@ restorecon -R /
EOF EOF
systemctl enable sddm.service systemctl enable --force sddm.service
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
%end %end

View File

@ -4,7 +4,7 @@
%include rocky-live-kde-base.ks %include rocky-live-kde-base.ks
# DVD # DVD
part / --size=7000 part / --size=7300
%post %post
%end %end

View File

@ -21,7 +21,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
mkdir -p /home/liveuser/.config/xfce4 mkdir -p /home/liveuser/.config/xfce4
# ugly stuff, this should give us a default background for now # ugly stuff, this should give us a default background for now
mkdir -p /usr/share/backgrounds/images 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 /usr/share/backgrounds/images/default.png
cat > /home/liveuser/.config/xfce4/helpers.rc << FOE 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 # set up autologin for user liveuser
if [ -f /etc/sddm.conf ]; then if [ -f /etc/sddm.conf ]; then
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf 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 else
cat > /etc/sddm.conf << SDDM_EOF cat > /etc/sddm.conf << SDDM_EOF
[Autologin] [Autologin]
User=liveuser User=liveuser
Session=xfce Session=xfce.desktop
SDDM_EOF SDDM_EOF
fi fi
@ -76,7 +76,13 @@ fi
# Show harddisk install on the 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 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 # no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop 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) # and mark it as executable (new Xfce security feature)
chmod +x /home/liveuser/Desktop/liveinst.desktop 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. # this goes at the end after all other changes.
chown -R liveuser:liveuser /home/liveuser chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser restorecon -R /home/liveuser
@ -91,7 +100,7 @@ restorecon -R /home/liveuser
EOF EOF
# this doesn't come up automatically. not sure why. # this doesn't come up automatically. not sure why.
systemctl enable sddm.service systemctl enable --force sddm.service
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
%end %end

View File

@ -61,6 +61,12 @@ chmod +x /usr/share/applications/liveinst.desktop
mkdir /home/liveuser/Desktop mkdir /home/liveuser/Desktop
cp -a /usr/share/applications/liveinst.desktop /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 # Set akonadi backend
mkdir -p /home/liveuser/.config/akonadi mkdir -p /home/liveuser/.config/akonadi
cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
@ -68,6 +74,9 @@ cat > /home/liveuser/.config/akonadi/akonadiserverrc << AKONADI_EOF
Driver=QSQLITE3 Driver=QSQLITE3
AKONADI_EOF AKONADI_EOF
# Disable plasma-pk-updates if applicable
rpm -e plasma-pk-updates
# "Disable plasma-discover-notifier" # "Disable plasma-discover-notifier"
mkdir -p /home/liveuser/.config/autostart mkdir -p /home/liveuser/.config/autostart
cp -a /etc/xdg/autostart/org.kde.discover.notifier.desktop /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 Indexing-Enabled=false
BALOO_EOF BALOO_EOF
mkdir -p ~liveuser/.kde/share/config/
# Disable kres-migrator # Disable kres-migrator
cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF cat > /home/liveuser/.kde/share/config/kres-migratorrc << KRES_EOF
[Migration] [Migration]
@ -98,7 +109,7 @@ restorecon -R /
EOF EOF
systemctl enable sddm.service systemctl enable --force sddm.service
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
%end %end

View File

@ -21,7 +21,7 @@ cat >> /etc/rc.d/init.d/livesys << EOF
mkdir -p /home/liveuser/.config/xfce4 mkdir -p /home/liveuser/.config/xfce4
# ugly stuff, this should give us a default background for now # ugly stuff, this should give us a default background for now
mkdir -p /usr/share/backgrounds/images 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 /usr/share/backgrounds/images/default.png
cat > /home/liveuser/.config/xfce4/helpers.rc << FOE 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 # set up autologin for user liveuser
if [ -f /etc/sddm.conf ]; then if [ -f /etc/sddm.conf ]; then
sed -i 's/^#User=.*/User=liveuser/' /etc/sddm.conf 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 else
cat > /etc/sddm.conf << SDDM_EOF cat > /etc/sddm.conf << SDDM_EOF
[Autologin] [Autologin]
User=liveuser User=liveuser
Session=xfce Session=xfce.desktop
SDDM_EOF SDDM_EOF
fi fi
@ -76,7 +76,13 @@ fi
# Show harddisk install on the 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 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 # no updater applet in live environment
rm -f /etc/xdg/autostart/org.mageia.dnfdragora-updater.desktop 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) # and mark it as executable (new Xfce security feature)
chmod +x /home/liveuser/Desktop/liveinst.desktop 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. # this goes at the end after all other changes.
chown -R liveuser:liveuser /home/liveuser chown -R liveuser:liveuser /home/liveuser
restorecon -R /home/liveuser restorecon -R /home/liveuser
@ -91,7 +100,7 @@ restorecon -R /home/liveuser
EOF EOF
# this doesn't come up automatically. not sure why. # this doesn't come up automatically. not sure why.
systemctl enable sddm.service systemctl enable --force sddm.service
dnf config-manager --set-enabled powertools dnf config-manager --set-enabled powertools
%end %end