X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=keyscript-off;h=1cf19b0d24e6c782216986421264c238ad1f1826;hb=6f1f8a104c9b38936ade2d27e835479523985133;hp=9f6ab0f72e1eabe690db9339fd7386a3ed419d93;hpb=f5c8ee56b55b90298b48c83ed0f7ec98cce96bb5;p=distro-setup diff --git a/keyscript-off b/keyscript-off index 9f6ab0f..1cf19b0 100755 --- 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,7 +31,7 @@ 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