changes for buster linode

[distro-setup] / keyscript-off

diff --git a/keyscript-off b/keyscript-off
index 6aa5265167912ddcb8917293d06849f6e28e0cde..1cf19b0d24e6c782216986421264c238ad1f1826 100755 (executable)
--- a/keyscript-off
+++ b/keyscript-off
@@ -16,12 +16,11 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
-[[ $EUID == 0 ]] || exec sudo "${BASH_SOURCE}" "$@"
+[[ $EUID == 0 ]] || exec sudo -E "${BASH_SOURCE[0]}" "$@"
 if [[ $- != *i* ]]; then
     exec &>/var/log/keyscript-off.log
     echo "$0: starting. $(date)"
 fi
-
 sed="sed --follow-symlinks"
 
 if [[ $($sed -rn 's/^ID=(.*)/\1/p' /etc/os-release) == arch ]]; then
@@ -32,12 +31,12 @@ if [[ $($sed -rn 's/^ID=(.*)/\1/p' /etc/os-release) == arch ]]; then
 else
     x=/root/keyscript
     if grep -q "${x}," /etc/crypttab; then
-        $sed -i "s#${x},#${x}-manual,#" /etc/crypttab
+      $sed -i "s#${x},#decrypt_keyctl,#" /etc/crypttab
        update-initramfs -u
     fi
 fi
 
 # switch to easy or hard pass which is the same as luks
 f=/q/root/shadow/traci
-[[ $HOSTNAME != tp ]] || usermod -p "$(cat $f)" iank
+[[ $HOSTNAME != tpnew ]] || usermod -p "$(cat $f)" iank
 echo "$0: finished. $(date)"