diff options
| -rw-r--r-- | public/progs.csv | 1 | ||||
| -rwxr-xr-x | public/thesiah.sh | 9 | ||||
| -rw-r--r-- | static/progs.csv | 1 | ||||
| -rwxr-xr-x | static/thesiah.sh | 9 |
4 files changed, 16 insertions, 4 deletions
diff --git a/public/progs.csv b/public/progs.csv index fae619f..cfb908c 100644 --- a/public/progs.csv +++ b/public/progs.csv @@ -94,6 +94,7 @@ A,mutt-wizard-git,is a light-weight terminal-based email system. ,openvpn,is an open source VPN daemon. I,openssh,is SSH protocol implementation for remote login, command execution and file transfer. A,pam-gnupg,auto unlocks when log-in. +,pam_mount,is a PAM module that can mount volumes for a user session. ,pass,manages passwords. ,pipewire-jack,is a low-latency audio/video router and processor - JACK replacement. ,pipewire-pulse,gives pipewire compatibility with PulseAudio programs. diff --git a/public/thesiah.sh b/public/thesiah.sh index 0fc4131..a413fe9 100755 --- a/public/thesiah.sh +++ b/public/thesiah.sh @@ -337,8 +337,13 @@ addsudo() { pamgnupg() { whiptail --infobox "Setting up pam-gnupg..." 7 50 $aurhelper -Qq pam-gnupg >/dev/null 2>&1 || aurinstall pam-gnupg - echo "auth optional pam_gnupg.so store-only" >>/etc/pam.d/system-local-login >/dev/null 2>&1 - echo "session optional pam_gnupg.so " >>/etc/pam.d/system-local-login >/dev/null 2>&1 + pacman -Qq pam_mount >/dev/null 2>&1 || installpkg pam_mount + sleep 3 + grep -Eq "auth\s+optional\s+pam_gnupg.so store-only" /etc/pam.d/system-local-login || echo "auth optional pam_gnupg.so store-only" >>/etc/pam.d/system-local-login + grep -Eq "session\s+optional\s+pam_gnupg.so" /etc/pam.d/system-local-login || echo "session optional pam_gnupg.so" >>/etc/pam.d/system-local-login + grep -Eq "auth\s+optional\s+pam_mount.so" /etc/pam.d/system-login || sed -i "/auth requisite pam_nologin.so/a auth optional pam_mount.so" /etc/pam.d/system-login + grep -Eq "password\s+optional\s+pam_mount.so" /etc/pam.d/system-login || sed -i "/password include system-auth/i password optional pam_mount.so " /etc/pam.d/system-login + grep -Eq "session\s+\[success=1 default=ignore\]\s+pam_succeed_if.so\s+service = systemd-user quiet" /etc/pam.d/system-login || sed -i "/session optional pam_keyinit.so force revoke/a session [success=1 default=ignore] pam_succeed_if.so service = systemd-user quiet\nsession optional pam_mount.so" /etc/pam.d/system-login } ecryptfssetup() { diff --git a/static/progs.csv b/static/progs.csv index fae619f..cfb908c 100644 --- a/static/progs.csv +++ b/static/progs.csv @@ -94,6 +94,7 @@ A,mutt-wizard-git,is a light-weight terminal-based email system. ,openvpn,is an open source VPN daemon. I,openssh,is SSH protocol implementation for remote login, command execution and file transfer. A,pam-gnupg,auto unlocks when log-in. +,pam_mount,is a PAM module that can mount volumes for a user session. ,pass,manages passwords. ,pipewire-jack,is a low-latency audio/video router and processor - JACK replacement. ,pipewire-pulse,gives pipewire compatibility with PulseAudio programs. diff --git a/static/thesiah.sh b/static/thesiah.sh index 0fc4131..a413fe9 100755 --- a/static/thesiah.sh +++ b/static/thesiah.sh @@ -337,8 +337,13 @@ addsudo() { pamgnupg() { whiptail --infobox "Setting up pam-gnupg..." 7 50 $aurhelper -Qq pam-gnupg >/dev/null 2>&1 || aurinstall pam-gnupg - echo "auth optional pam_gnupg.so store-only" >>/etc/pam.d/system-local-login >/dev/null 2>&1 - echo "session optional pam_gnupg.so " >>/etc/pam.d/system-local-login >/dev/null 2>&1 + pacman -Qq pam_mount >/dev/null 2>&1 || installpkg pam_mount + sleep 3 + grep -Eq "auth\s+optional\s+pam_gnupg.so store-only" /etc/pam.d/system-local-login || echo "auth optional pam_gnupg.so store-only" >>/etc/pam.d/system-local-login + grep -Eq "session\s+optional\s+pam_gnupg.so" /etc/pam.d/system-local-login || echo "session optional pam_gnupg.so" >>/etc/pam.d/system-local-login + grep -Eq "auth\s+optional\s+pam_mount.so" /etc/pam.d/system-login || sed -i "/auth requisite pam_nologin.so/a auth optional pam_mount.so" /etc/pam.d/system-login + grep -Eq "password\s+optional\s+pam_mount.so" /etc/pam.d/system-login || sed -i "/password include system-auth/i password optional pam_mount.so " /etc/pam.d/system-login + grep -Eq "session\s+\[success=1 default=ignore\]\s+pam_succeed_if.so\s+service = systemd-user quiet" /etc/pam.d/system-login || sed -i "/session optional pam_keyinit.so force revoke/a session [success=1 default=ignore] pam_succeed_if.so service = systemd-user quiet\nsession optional pam_mount.so" /etc/pam.d/system-login } ecryptfssetup() { |