X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=keyscript-off;h=2984a2a7b0108acbb3d43757eb18e55015c8a365;hp=ed16201539d206d4feef442c32c685e846e636ad;hb=79b274fcd8bfa556133ab13270e84b40aebe8468;hpb=aa5f34ec8f63eb7e893836f8c78890dbecf1373e

diff --git a/keyscript-off b/keyscript-off
index ed16201..2984a2a 100755
--- a/keyscript-off
+++ b/keyscript-off
@@ -1,40 +1,31 @@
 #!/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
+if [[ $($sed -rn 's/^ID=(.*)/\1/p' /etc/os-release) == arch ]]; then
     if grep -q '^\s*FILES=' /etc/mkinitcpio.conf; then
-        sed -ri --follow-symlinks 's/^\s*FILES=/#\0/' /etc/mkinitcpio.conf # comment out
+        $sed -ri 's/^\s*FILES=/#\0/' /etc/mkinitcpio.conf # comment out
         mkinitcpio -p linux
     fi
 else
-    if grep -q '/root/keyscript-manual' /etc/crypttab; then
-        sed -i --follow-symlinks 's#/root/keyscript,#/root/keyscript-manual,#' /etc/crypttab
-        update-initramfs -u
+    x=/root/keyscript
+    if grep -q "${x}," /etc/crypttab; then
+      $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)"