fi
rootn=1
+sed="sed --follow-symlinks"
+
if [[ ! -e /tmp/keyscript-off ]]; then
- 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=.*)/\1/' /etc/mkinitcpio.conf # uncomment
+ $sed -ri 's/^#(\s*FILES=.*)/\1/' /etc/mkinitcpio.conf # uncomment
mkinitcpio -p linux
fi
else
- if grep -q '/root/keyscript,' /etc/crypttab; then
- sed -i --follow-symlinks 's#/root/keyscript-manual,#/root/keyscript,#' /etc/crypttab
- update-initramfs -u
+ x=/root/keyscript
+ if grep -q "${x}-manual," /etc/crypttab; then
+ $sed -i "s#${x}-manual,#${x},#" /etc/crypttab
+ update-initramfs -u
fi
fi
fi
# switch to easy or hard login pass which is the same as luks
f=/q/root/shadow/traci-simple
-[[ $HOSTNAME != tp ]] || usermod -p "$(cat $f)" ian
+[[ $HOSTNAME != tpnew ]] || usermod -p "$(cat $f)" iank
echo "$0: finished. $(date)"