diff options
Diffstat (limited to '')
-rw-r--r-- | kde/post-install/kde-baseapps.patch (renamed from kde/post-install/kdebase.post-install) | 4 | ||||
-rw-r--r--[-rwxr-xr-x] | kde/post-install/kde-baseapps/profile.d/kde.csh (renamed from kde/post-install/kdebase/profile.d/kde.csh) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | kde/post-install/kde-baseapps/profile.d/kde.sh (renamed from kde/post-install/kdebase/profile.d/kde.sh) | 0 | ||||
-rw-r--r-- | kde/post-install/kde-runtime.post-install | 4 | ||||
-rw-r--r-- | kde/post-install/kde-workspace.post-install | 11 | ||||
-rw-r--r--[-rwxr-xr-x] | kde/post-install/kde-workspace/xinit/xinitrc.kde | 0 | ||||
-rw-r--r-- | kde/post-install/kdepim.post-install | 2 | ||||
-rw-r--r-- | kde/post-install/wicd-kde.post-install | 2 |
8 files changed, 21 insertions, 2 deletions
diff --git a/kde/post-install/kdebase.post-install b/kde/post-install/kde-baseapps.patch index e18f8fe..8dda636 100644 --- a/kde/post-install/kdebase.post-install +++ b/kde/post-install/kde-baseapps.patch @@ -1,9 +1,9 @@ # Add profile scripts mkdir -p $PKG/etc/profile.d -cat $CWD/post-install/kdebase/profile.d/kde.sh \ +cat $CWD/post-install/kde-baseapps/profile.d/kde.sh \ | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \ > $PKG/etc/profile.d/kde.sh -cat $CWD/post-install/kdebase/profile.d/kde.csh \ +cat $CWD/post-install/kde-baseapps/profile.d/kde.csh \ | sed -e "s#/lib/#/lib${LIBDIRSUFFIX}/#" \ > $PKG/etc/profile.d/kde.csh chmod 0755 $PKG/etc/profile.d/* diff --git a/kde/post-install/kdebase/profile.d/kde.csh b/kde/post-install/kde-baseapps/profile.d/kde.csh index a09579b..a09579b 100755..100644 --- a/kde/post-install/kdebase/profile.d/kde.csh +++ b/kde/post-install/kde-baseapps/profile.d/kde.csh diff --git a/kde/post-install/kdebase/profile.d/kde.sh b/kde/post-install/kde-baseapps/profile.d/kde.sh index 6f0199e..6f0199e 100755..100644 --- a/kde/post-install/kdebase/profile.d/kde.sh +++ b/kde/post-install/kde-baseapps/profile.d/kde.sh diff --git a/kde/post-install/kde-runtime.post-install b/kde/post-install/kde-runtime.post-install index 914cfe8..fbdacfa 100644 --- a/kde/post-install/kde-runtime.post-install +++ b/kde/post-install/kde-runtime.post-install @@ -3,3 +3,7 @@ # Remove the hicolor icon theme index.theme so it doesn't clobber the real one rm -f $PKG/usr/share/icons/hicolor/index.theme + +# Move the dbus configuration files to the proper place: +mv $PKG/etc/kde/dbus-1 $PKG/etc/ + 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: diff --git a/kde/post-install/kde-workspace/xinit/xinitrc.kde b/kde/post-install/kde-workspace/xinit/xinitrc.kde index a33eb06..a33eb06 100755..100644 --- a/kde/post-install/kde-workspace/xinit/xinitrc.kde +++ b/kde/post-install/kde-workspace/xinit/xinitrc.kde diff --git a/kde/post-install/kdepim.post-install b/kde/post-install/kdepim.post-install new file mode 100644 index 0000000..8810114 --- /dev/null +++ b/kde/post-install/kdepim.post-install @@ -0,0 +1,2 @@ +# Move the dbus configuration files to the proper place: +mv $PKG/etc/kde/dbus-1 $PKG/etc/ diff --git a/kde/post-install/wicd-kde.post-install b/kde/post-install/wicd-kde.post-install new file mode 100644 index 0000000..8810114 --- /dev/null +++ b/kde/post-install/wicd-kde.post-install @@ -0,0 +1,2 @@ +# Move the dbus configuration files to the proper place: +mv $PKG/etc/kde/dbus-1 $PKG/etc/ |