X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=distro-begin;h=570d077ca68d1fc9f5bdbb666962de4e83506bdb;hb=410b30bc4194a6c84db5d73b15a7e211ce47bc9c;hp=b2b21f783f68c67b380e38f17704c2b91e6f2b41;hpb=6459d4698ef983f7b1540589b87013c76913393d;p=distro-setup

diff --git a/distro-begin b/distro-begin
index b2b21f7..570d077 100755
--- a/distro-begin
+++ b/distro-begin
@@ -36,6 +36,11 @@ if ! $interactive; then
   set -x
 fi
 source /a/bin/errhandle/err
+
+_errcatch_cleanup() {
+  echo 1 >~/.local/distro-begin
+}
+
 source /a/bin/distro-functions/src/package-manager-abstractions
 
 ### setup logging
@@ -106,6 +111,8 @@ if encrypted; then
   sudo dd of=/etc/systemd/system/keyscripton.service <<'EOF'
 [Unit]
 Description=Turn on automatic decryption of drives on boot
+# This is triggered by reboot and when keyscriptoff stops.
+
 # tried using graphical.target, but it made my display manager restart before rebooting.
 # generally, I don't think targets order shutdown like they do startup.
 # So, I did systemd-analyze plot > something.svg, and picked a reliably started
@@ -125,8 +132,6 @@ ExecStop=/a/exe/keyscript-on
 WantedBy=keyscriptoff.service
 EOF
   sudo systemctl daemon-reload # needed if the file was already there
-  sudo systemctl stop keyscripton.service
-  #    sudo systemctl start keyscripton.service
   sudo systemctl enable keyscripton.service
 
   sudo dd of=/etc/systemd/system/keyscriptoff.service <<'EOF'
@@ -153,7 +158,7 @@ EOF
     | sudo dd of=$tmp
   if ! diff -q /etc/initramfs-tools/modules $tmp &>/dev/null; then
     sudo dd if=$tmp of=/etc/initramfs-tools/modules
-    sudo /usr/sbin update-initramfs -u -k all
+    sudo /usr/sbin/update-initramfs -u -k all
   fi
   # initram auth keys get setup with rootsshsync
   $script_dir/rootsshsync
@@ -190,8 +195,10 @@ if [[ $HOSTNAME != $(cat /etc/hostname) ]]; then
   echo $HOSTNAME > /etc/hostname
   hostname -F /etc/hostname
 fi
-sudo $sed -i '/^127\.0\.1\.1/d' /etc/hosts
-echo "127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME" | sudo tee -a /etc/hosts
+sudo sed -i --follow-symlinks -f - /etc/hosts <<EOF
+\$a 127.0.1.1 $HOSTNAME.b8.nz $HOSTNAME
+/^127\.0\.1\.1/d
+EOF
 
 
 ##### exit first stage if running as root
@@ -202,7 +209,7 @@ fi
 
 
 #### setup bash for root
-for x in /a/c/{.bashrc,brc,.bash_profile,.profile,.inputrc,path_add_function}; do
+for x in /a/c/{.bashrc,brc,brc2,.bash_profile,.profile,.inputrc,path_add_function}; do
   sudo -i <<EOF
 PATH="/a/exe:$PATH"
 lnf $x /root
@@ -582,5 +589,7 @@ if $emacs; then
   /a/exe/ssh-emacs-setup
 fi
 
+
+echo 0 >~/.local/distro-begin
 echo "$0: $(date): ending now"
 exit 0