diff options
Diffstat (limited to 'kde/post-install')
-rw-r--r-- | kde/post-install/plasma-workspace.post-install | 20 | ||||
-rw-r--r-- | kde/post-install/plasma-workspace/pam.d/kde | 9 | ||||
-rw-r--r-- | kde/post-install/sddm-qt5.post-install | 18 | ||||
-rw-r--r-- | kde/post-install/sddm-qt5/pam.d/sddm | 15 | ||||
-rw-r--r-- | kde/post-install/sddm-qt5/pam.d/sddm-autologin | 14 | ||||
-rw-r--r-- | kde/post-install/sddm-qt5/pam.d/sddm-greeter | 18 |
6 files changed, 84 insertions, 10 deletions
diff --git a/kde/post-install/plasma-workspace.post-install b/kde/post-install/plasma-workspace.post-install index 19e5c71..e0dbe78 100644 --- a/kde/post-install/plasma-workspace.post-install +++ b/kde/post-install/plasma-workspace.post-install @@ -12,10 +12,6 @@ cat $CWD/post-install/plasma-workspace/scripts/startkwayland \ > $PKG/usr/bin/startkwayland chmod 0755 $PKG/usr/bin/startkwayland -# ck-launch-session is needed for a Wayland session, since we do not have PAM: -sed -e 's/^Exec=dbus-launch/Exec=ck-launch-session dbus-launch --sh-syntax/' \ - -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop - # Add a "fail-safe" version of KDE Plasma desktop session. # Prefix the name with "z_" because SDDM is braindead: mkdir -p $PKG/usr/share/xsessions @@ -31,8 +27,16 @@ rmdir $PKG/usr/lib$LIBDIRSUFFIX/qt5/plugins/plugins mkdir -p $PKG/etc mv $PKG//etc/kde/dbus-1 $PKG/etc/ -# For shadow, this file needs to be setuid root just like the KDE4 version: -if [ -f $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass ]; then - chmod +s $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass -fi +if [ "$SLACKPAM" == "no" ]; then + # For shadow, this file needs to be setuid root just like the KDE4 version: + if [ -f $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass ]; then + chmod +s $PKG/usr/lib$LIBDIRSUFFIX/kcheckpass + fi + # ck-launch-session is needed for a Wayland session, since we do not have PAM: + sed -e 's/^Exec=dbus-launch/Exec=ck-launch-session dbus-launch --sh-syntax/' \ + -i $PKG/usr/share/wayland-sessions/plasmawayland.desktop +else + # Install a PAM file for Plasma5 workspace: + install -Dm644 $CWD/post-install/plasma-workspace/pam.d/kde $PKG/etc/pam.d/kde +fi diff --git a/kde/post-install/plasma-workspace/pam.d/kde b/kde/post-install/plasma-workspace/pam.d/kde new file mode 100644 index 0000000..7acfd90 --- /dev/null +++ b/kde/post-install/plasma-workspace/pam.d/kde @@ -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 diff --git a/kde/post-install/sddm-qt5.post-install b/kde/post-install/sddm-qt5.post-install index 1a39fd0..006e234 100644 --- a/kde/post-install/sddm-qt5.post-install +++ b/kde/post-install/sddm-qt5.post-install @@ -1,9 +1,23 @@ -# Remove PAM related stuff: -rm -rf $PKG/etc/pam.d +if [ "$SLACKPAM" == "no" ]; then + # Remove PAM related stuff: + rm -rf $PKG/etc/pam.d +else + # Replace systemd-centric files with ours: + rm -f $PKG/etc/pam.d/sddm* + for FILE in sddm sddm-autologin sddm-greeter ; do + install -Dm644 $CWD/post-install/sddm-qt5/pam.d/$FILE $PKG/etc/pam.d/$FILE + done +fi # Remove the sddm.conf file because we will generate our own in doinst.sh: rm -f $PKG/etc/sddm.conf +# Ensure that user customizations to the session files are not lost: +mv $PKG/usr/share/sddm/scripts/Xsession{,.new} +mv $PKG/usr/share/sddm/scripts/Xsetup{,.new} +mv $PKG/usr/share/sddm/scripts/Xstop{,.new} +mv $PKG/usr/share/sddm/scripts/wayland-session{,.new} + # Add a wrapper for the sddm binary, to enable a custom environment: mv $PKG/usr/bin/sddm $PKG/usr/bin/sddm.bin cat <<"EOT" > $PKG/usr/bin/sddm diff --git a/kde/post-install/sddm-qt5/pam.d/sddm b/kde/post-install/sddm-qt5/pam.d/sddm new file mode 100644 index 0000000..9dcda93 --- /dev/null +++ b/kde/post-install/sddm-qt5/pam.d/sddm @@ -0,0 +1,15 @@ +#%PAM-1.0 + +auth include login +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so + +account include login + +password include login +-password optional pam_gnome_keyring.so use_authtok + +session optional pam_keyinit.so force revoke +session include login +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start diff --git a/kde/post-install/sddm-qt5/pam.d/sddm-autologin b/kde/post-install/sddm-qt5/pam.d/sddm-autologin new file mode 100644 index 0000000..fe410bb --- /dev/null +++ b/kde/post-install/sddm-qt5/pam.d/sddm-autologin @@ -0,0 +1,14 @@ +#%PAM-1.0 +auth required pam_env.so +auth include system-auth +auth include postlogin +-auth optional pam_gnome_keyring.so +-auth optional pam_kwallet5.so +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 +-session optional pam_gnome_keyring.so auto_start +-session optional pam_kwallet5.so auto_start diff --git a/kde/post-install/sddm-qt5/pam.d/sddm-greeter b/kde/post-install/sddm-qt5/pam.d/sddm-greeter new file mode 100644 index 0000000..7c77b68 --- /dev/null +++ b/kde/post-install/sddm-qt5/pam.d/sddm-greeter @@ -0,0 +1,18 @@ +#%PAM-1.0 + +# Load environment from /etc/environment and ~/.pam_environment +auth required pam_env.so + +# Always let the greeter start without authentication +auth required pam_permit.so + +# No action required for account management +account required pam_permit.so + +# Can't change password +password required pam_deny.so + +# Setup session +session required pam_unix.so +session optional pam_systemd.so +session optional pam_elogind.so |