[pam-slx-plug] Move old pam_script_* hook dirs to pam dir

They're all now in subdirectories of /opt/openslx/pam/hooks.

Symlinks have been put in place where they used to reside.

13 files changed, 15 insertions, 7 deletions

diff --git a/core/modules/dnbd3/data/opt/openslx/scripts/pam_script_ses_open.d/10-fuse b/core/modules/dnbd3/data/opt/openslx/pam/hooks/auth-final-exec.d/10-add-to-fuse.sh
index 893dbd5e..db19194d 100644..100755
--- a/core/modules/dnbd3/data/opt/openslx/scripts/pam_script_ses_open.d/10-fuse
+++ b/core/modules/dnbd3/data/opt/openslx/pam/hooks/auth-final-exec.d/10-add-to-fuse.sh
@@ -1,3 +1,6 @@
+#!/bin/ash
+
 adduser "${PAM_USER}" "fuse"
-true
+
+exit 0
 
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/pam_script_ses_close.d/usage_stats b/core/modules/hardware-stats/data/opt/openslx/pam/hooks/session-close.d/usage_stats
index 129ca2f8..129ca2f8 120000
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/pam_script_ses_close.d/usage_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/pam/hooks/session-close.d/usage_stats
diff --git a/core/modules/hardware-stats/data/opt/openslx/scripts/pam_script_ses_open.d/usage_stats b/core/modules/hardware-stats/data/opt/openslx/pam/hooks/session-open.d/usage_stats
index e2154aa7..e2154aa7 100644
--- a/core/modules/hardware-stats/data/opt/openslx/scripts/pam_script_ses_open.d/usage_stats
+++ b/core/modules/hardware-stats/data/opt/openslx/pam/hooks/session-open.d/usage_stats
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/pam_script_ses_open.d/00-chromium-policies b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/00-chromium-policies
index b9e0afb0..743d53ed 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/pam_script_ses_open.d/00-chromium-policies
+++ b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/00-chromium-policies
@@ -1,5 +1,5 @@
 #!/bin/bash
-# ^SOURCED
+# ^SOURCED, actually running in ash
 
 . /opt/openslx/config
 
diff --git a/core/modules/kiosk-chromium/data/opt/openslx/scripts/pam_script_ses_open.d/10-chromium-urlfilter b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter
index f80ed34a..d4add9b1 100644
--- a/core/modules/kiosk-chromium/data/opt/openslx/scripts/pam_script_ses_open.d/10-chromium-urlfilter
+++ b/core/modules/kiosk-chromium/data/opt/openslx/pam/hooks/session-open.d/10-chromium-urlfilter
@@ -1,4 +1,5 @@
 #!/bin/bash
+#^ SOURCED, actually running in ash
 
 format_urls() {
 	local url scheme host path count chost
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_session b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_session
index 8e7b7bff..b1e271cd 100755
--- a/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_session
+++ b/core/modules/pam-slx-plug/data/opt/openslx/pam/exec_session
@@ -13,8 +13,8 @@ export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/o
 
 if [ "$PAM_TYPE" = "open_session" ]; then
 	# OPEN OPEN OPEN
-	# source the stuff in pam_script_ses_open.d, if it exists
-	for HOOK in /opt/openslx/scripts/pam_script_ses_open.d/*; do
+	# source the stuff in session-open.d, if it exists
+	for HOOK in /opt/openslx/pam/hooks/session-open.d/*; do
 		[ -f "$HOOK" ] || continue
 		# source it, in case of failure do nothing since these scripts are non-critical
 		( . "$HOOK" ) || slxlog "pam-hooks-ses-open" "Could not source '$HOOK'."
@@ -23,7 +23,7 @@ if [ "$PAM_TYPE" = "open_session" ]; then
 elif [ "$PAM_TYPE" = "close_session" ]; then
 	# CLOSE CLOSE CLOSE
 	# source hooks if there are any
-	for HOOK in /opt/openslx/scripts/pam_script_ses_close.d/*; do
+	for HOOK in /opt/openslx/pam/hooks/session-close.d/*; do
 		[ -f "$HOOK" ] || continue
 		# failure is non-critical
 		( . "$HOOK" ) || slxlog "pam-hooks-ses-close" "Could not source '$HOOK'."
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_close.d b/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_close.d
new file mode 120000
index 00000000..db47dbe3
--- /dev/null
+++ b/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_close.d
@@ -0,0 +1 @@
+/opt/openslx/pam/hooks/session-close.d
\ No newline at end of file
diff --git a/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_open.d b/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_open.d
new file mode 120000
index 00000000..3ae27c4f
--- /dev/null
+++ b/core/modules/pam-slx-plug/data/opt/openslx/scripts/pam_script_ses_open.d
@@ -0,0 +1 @@
+/opt/openslx/pam/hooks/session-open.d
\ No newline at end of file
diff --git a/core/modules/pam-slxlog-session/data/opt/openslx/scripts/pam_script_ses_close.d/00-slxlog b/core/modules/pam-slxlog-session/data/opt/openslx/pam/hooks/session-close.d/00-slxlog
index 2f41ab74..2f41ab74 100644
--- a/core/modules/pam-slxlog-session/data/opt/openslx/scripts/pam_script_ses_close.d/00-slxlog
+++ b/core/modules/pam-slxlog-session/data/opt/openslx/pam/hooks/session-close.d/00-slxlog
diff --git a/core/modules/pam-slxlog-session/data/opt/openslx/scripts/pam_script_ses_open.d/00-slxlog b/core/modules/pam-slxlog-session/data/opt/openslx/pam/hooks/session-open.d/00-slxlog
index fc340891..fc340891 100644
--- a/core/modules/pam-slxlog-session/data/opt/openslx/scripts/pam_script_ses_open.d/00-slxlog
+++ b/core/modules/pam-slxlog-session/data/opt/openslx/pam/hooks/session-open.d/00-slxlog
diff --git a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials
index 613c66ca..613c66ca 100644
--- a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_auth.d/99-run_virt_credentials
+++ b/core/modules/run-virt/data/opt/openslx/pam/hooks/auth-slx-source.d/99-run_virt_credentials
diff --git a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_ses_close.d/runvirt-firewall-clear b/core/modules/run-virt/data/opt/openslx/pam/hooks/session-close.d/runvirt-firewall-clear
index dab08190..4fdd88ab 100644
--- a/core/modules/run-virt/data/opt/openslx/scripts/pam_script_ses_close.d/runvirt-firewall-clear
+++ b/core/modules/run-virt/data/opt/openslx/pam/hooks/session-close.d/runvirt-firewall-clear
@@ -1,6 +1,6 @@
 #!/bin/ash
 
-# Sourced by pam_script_ses_close
+# Sourced as session-close hook
 
 runvirt_fw_clear () {
 	iptables -w -F runvirt-INPUT
diff --git a/core/modules/vbox-src/data/opt/openslx/scripts/pam_script_ses_open.d/20-vbox b/core/modules/vbox-src/data/opt/openslx/pam/hooks/auth-final-exec.d/20-add-to-vboxusers.sh
index 00d7cab2..05ccbb99 100644..100755
--- a/core/modules/vbox-src/data/opt/openslx/scripts/pam_script_ses_open.d/20-vbox
+++ b/core/modules/vbox-src/data/opt/openslx/pam/hooks/auth-final-exec.d/20-add-to-vboxusers.sh
@@ -1,4 +1,6 @@
+#!/bin/ash
+
 getent group vboxusers || addgroup -S vboxusers
 adduser "${PAM_USER}" "vboxusers"
-true
 
+exit 0