|
@@ -15,16 +15,22 @@ PASSWORD="$PAM_AUTHTOK"
|
|
|
USER_UID="$(getent passwd "$LOGIN" | awk -F ':' '{print $3}')"
|
|
|
|
|
|
if [ "$PASSWORD" = "" ]; then
|
|
|
- PASSWORD="$(cat /dev/shm/.~pamgate."$LOGIN")"
|
|
|
+ PASSWORD="$(cat /dev/shm/.~pamgate."$LOGIN" 2>/dev/null)"
|
|
|
fi
|
|
|
rm -f /dev/shm/.~pamgate."$LOGIN"
|
|
|
|
|
|
PASSWD="$PASSWORD" # for mount.cifs
|
|
|
+
|
|
|
+if [ "$PASSWD" = "" ]; then
|
|
|
+ exit 0
|
|
|
+fi
|
|
|
+
|
|
|
+export LOGIN
|
|
|
export PASSWD
|
|
|
|
|
|
SRV=172.16.0.3
|
|
|
ROUTER=172.16.0.1
|
|
|
-if [ "$(cat /sys/class/net/eth1/address 2>/dev/null)" != "52:54:00:31:14:02" ]; then
|
|
|
+if [ "$(cat /sys/class/net/eth1/address 2>/dev/null)" != "52:54:00:31:14:02" -a "$(cat /sys/class/net/eth1/address 2>/dev/null)" != "52:54:01:31:14:02" ]; then
|
|
|
if /sbin/route -n | grep ^192.168.100 > /dev/null; then
|
|
|
SRV=192.168.100.206
|
|
|
ROUTER=192.168.100.206
|
|
@@ -88,8 +94,8 @@ sudo /lib/live/config/0007-time >/dev/null 2>/dev/null &
|
|
|
|
|
|
unset PASSWD
|
|
|
|
|
|
-mkdir /tmp/login_scripts-"$LOGIN"
|
|
|
-cd /tmp/login_scripts-"$LOGIN"
|
|
|
+mkdir /tmp/.login_scripts-"$LOGIN"
|
|
|
+cd /tmp/.login_scripts-"$LOGIN"
|
|
|
|
|
|
# default pre scripts
|
|
|
wget https://auth.clab.mephi.ru/scripts/default.sh -O default.sh -o /dev/null
|
|
@@ -102,7 +108,7 @@ jq '.login_scripts | .[] | [.scriptname] | @csv' /dev/shm/.loginresult."$LOGIN"
|
|
|
# running login scripts
|
|
|
PATH="/tmp/login_scripts-$LOGIN:$PATH" jq '.login_scripts | .[] | [.scriptname, .arguments] | @sh' /dev/shm/.loginresult."$LOGIN" | while read t; do eval "eval \"./$t\""; done
|
|
|
|
|
|
-rm -rf /tmp/login_scripts-"$LOGIN"
|
|
|
+rm -rf /tmp/.login_scripts-"$LOGIN"
|
|
|
cd /
|
|
|
|
|
|
rm -f /dev/shm/.loginresult."$LOGIN"
|