diff options
Diffstat (limited to 'source/kde')
-rw-r--r-- | source/kde/doinst.sh/kde-workspace | 5 | ||||
-rwxr-xr-x | source/kde/kde.SlackBuild | 10 | ||||
-rw-r--r-- | source/kde/post-install/kde-workspace.post-install | 9 | ||||
-rw-r--r-- | source/kde/post-install/kde-workspace/config/kde.pamd | 9 |
4 files changed, 25 insertions, 8 deletions
diff --git a/source/kde/doinst.sh/kde-workspace b/source/kde/doinst.sh/kde-workspace index 793bae74..5834cc55 100644 --- a/source/kde/doinst.sh/kde-workspace +++ b/source/kde/doinst.sh/kde-workspace @@ -13,9 +13,6 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/kde/kdm/backgroundrc.new -config etc/kde/kdm/kdmrc.new - if [ -x usr/bin/update-desktop-database ]; then usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 fi @@ -24,3 +21,5 @@ if [ -x usr/bin/update-mime-database ]; then usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 fi +config etc/kde/kdm/backgroundrc.new +config etc/kde/kdm/kdmrc.new diff --git a/source/kde/kde.SlackBuild b/source/kde/kde.SlackBuild index 06ae53d3..0fa0beea 100755 --- a/source/kde/kde.SlackBuild +++ b/source/kde/kde.SlackBuild @@ -327,11 +327,6 @@ build_mod_pkg () { # Strip binaries: strip_binaries $PKG - # If there's any special post-install things to do, do them: - if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then - . $CWD/post-install/${PKGNAME}.post-install - fi - # If this package requires some doinst.sh material, add it here: if [ -r $CWD/doinst.sh/${PKGNAME} ]; then mkdir -p $PKG/install @@ -340,6 +335,11 @@ build_mod_pkg () { >> $PKG/install/doinst.sh fi + # If there's any special post-install things to do, do them: + if [ -r $CWD/post-install/${PKGNAME}.post-install ]; then + . $CWD/post-install/${PKGNAME}.post-install + fi + # If this is a modular package, build it here: if [ -d $SLACK_KDE_BUILD_DIR/${kde_module}/package-$PKGNAME ]; then cd $PKG diff --git a/source/kde/post-install/kde-workspace.post-install b/source/kde/post-install/kde-workspace.post-install index 5cbabf50..f6e0c236 100644 --- a/source/kde/post-install/kde-workspace.post-install +++ b/source/kde/post-install/kde-workspace.post-install @@ -39,6 +39,15 @@ cat $CWD/post-install/kde-workspace/config/Xsession | sed -e "s#/lib#/lib${LIBDI # 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 +# Add config file if PAM is installed: +if [ -L /lib${LIBDIRSUFFIX}/libpam.so.? ]; then + mkdir -p $PKG/etc/pam.d + cp -a $CWD/post-install/kde-workspace/config/kde.pamd $PKG/etc/pam.d/kde.new + chown root:root $PKG/etc/pam.d/kde.new + chmod 644 $PKG/etc/pam.d/kde.new + echo "config etc/pam.d/kde.new" >> $PKG/install/doinst.sh +fi + # Move the KDM files someplace FHS compliant: mkdir -p $PKG/etc/kde mv $PKG/usr/share/config/kdm $PKG/etc/kde diff --git a/source/kde/post-install/kde-workspace/config/kde.pamd b/source/kde/post-install/kde-workspace/config/kde.pamd new file mode 100644 index 00000000..7acfd901 --- /dev/null +++ b/source/kde/post-install/kde-workspace/config/kde.pamd @@ -0,0 +1,9 @@ +#%PAM-1.0 +auth include system-auth +auth include postlogin +account include system-auth +password include system-auth +session include system-auth +session required pam_loginuid.so +session optional pam_ck_connector.so nox11 +session include postlogin |