minor bug fix

[distro-setup] / keyscript-off

diff --git a/keyscript-off b/keyscript-off
index c4ac8d52eeeab9e3109fa31070d31c76b6910026..2984a2a7b0108acbb3d43757eb18e55015c8a365 100755 (executable)
--- a/keyscript-off
+++ b/keyscript-off
@@ -1,27 +1,15 @@
 #!/bin/bash
-# Copyright (C) 2016 Ian Kelling
-
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-
-#     http://www.apache.org/licenses/LICENSE-2.0
-
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Copyright (C) 2019 Ian Kelling
+# SPDX-License-Identifier: AGPL-3.0-or-later
 
 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 +20,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)" ian
+[[ $HOSTNAME != tpnew ]] || usermod -p "$(cat $f)" iank
 echo "$0: finished. $(date)"