summaryrefslogtreecommitdiffstats
path: root/kde/post-install/kde-workspace.post-install
diff options
context:
space:
mode:
Diffstat (limited to 'kde/post-install/kde-workspace.post-install')
-rw-r--r--kde/post-install/kde-workspace.post-install11
1 files changed, 11 insertions, 0 deletions
diff --git a/kde/post-install/kde-workspace.post-install b/kde/post-install/kde-workspace.post-install
index 68dd052..69952c7 100644
--- a/kde/post-install/kde-workspace.post-install
+++ b/kde/post-install/kde-workspace.post-install
@@ -8,6 +8,13 @@ chmod 0755 $PKG/etc/X11/xinit/xinitrc.kde
# Setup config files for KDM:
$PKG/usr/bin/genkdmconf --no-old --no-old-scripts --no-backup --in $PKG/usr/share/config/kdm
+# Add Slackware's standard xsessions path to kdmrc and remove the redundant
+# xsession files for XFCE (those are installed by the xcfe package):
+if ! grep -q "SessionsDirs=/usr/share/xsessions" $PKG/usr/share/config/kdm/kdmrc ; then
+ sed -i -e "/SessionsDirs=/s#SessionsDirs=\(.*\)\$#SessionsDirs=/usr/share/xsessions,\1#" $PKG/usr/share/config/kdm/kdmrc
+fi
+rm $PKG/usr/share/apps/kdm/sessions/xfce*.desktop
+
# Not allowing root to login at the console is just plain silly. If they
# have physical access to the machine, what's the point of trying to stop
# this? Even the kdmrc file says this is supposed to be the default.
@@ -16,11 +23,15 @@ sed -i 's/AllowRootLogin=false/AllowRootLogin=true/' \
# We are also not ready to create a separate 'kdm' non-root user:
sed -i 's/GreeterUID=kdm/#&/' \
$PKG/usr/share/config/kdm/kdmrc
+
+# Add a .new suffix so we don't mangle an existing file:
mv $PKG/usr/share/config/kdm/kdmrc $PKG/usr/share/config/kdm/kdmrc.new
cp -a $PKG/usr/share/config/kdm/Xsession $PKG/usr/share/config/kdm/Xsession.orig
cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDIRSUFFIX}#" \
> $PKG/usr/share/config/kdm/Xsession
+
+# Add a .new suffix so we don't mangle an existing file:
mv $PKG/usr/share/config/kdm/backgroundrc $PKG/usr/share/config/kdm/backgroundrc.new
# Move the KDM files someplace FHS compliant: