iankelling.org
/
git
/
distro-setup
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bunch of updates and fixes
[distro-setup]
/
keyscript-off
diff --git
a/keyscript-off
b/keyscript-off
index c4ac8d52eeeab9e3109fa31070d31c76b6910026..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
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
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
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
else
x=/root/keyscript
if grep -q "${x}," /etc/crypttab; then
-
$sed -i "s#${x},#${x}-manua
l,#" /etc/crypttab
+
$sed -i "s#${x},#decrypt_keyct
l,#" /etc/crypttab
update-initramfs -u
fi
fi
# switch to easy or hard pass which is the same as luks
f=/q/root/shadow/traci
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 != tp
new ]] || usermod -p "$(cat $f)" iank
echo "$0: finished. $(date)"
echo "$0: finished. $(date)"