general fixes

[distro-setup] / distro-begin

diff --git a/distro-begin b/distro-begin
index 4638980351caca0c5fff05a87c99efe102201a67..74bbdffaae42ce830c1fa795bb966d8d7ecf4e3f 100755 (executable)
--- a/distro-begin
+++ b/distro-begin
@@ -25,6 +25,8 @@
 # /a/bin/ds/filesystem/etc/prometheus/rules/iank.yml
 #
 # Update hostnames in /b/ds/check-remote-mailqs
 # /a/bin/ds/filesystem/etc/prometheus/rules/iank.yml
 #
 # Update hostnames in /b/ds/check-remote-mailqs

+# Update hostnames in /b/ds/machine_specific/*.hosts /p/c/machine_specific/*.hosts
+# Update hostnames in this file

 
 ### end new machine setup
 
 
 ### end new machine setup
 


@@ -55,7 +57,7 @@
 
 
 ### make ssh interactive shell run better. for when running line interactively line by line
 
 
 ### make ssh interactive shell run better. for when running line interactively line by line

-sudo bash -c '/a/exe/ssh-emacs-setup'
+sudo bash -c '/a/exe/ssh-emacs-setup' || exit $?

 
 ##### setup error handling
 interactive=true  # set this to false to force set -x
 
 ##### setup error handling
 interactive=true  # set this to false to force set -x


@@ -111,7 +113,7 @@ source $script_dir/pkgs
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x
 set +x
 source /a/bin/distro-functions/src/identify-distros
 $interactive || set -x

-for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo; do
+for f in kd x2 x3 x8 frodo tp li bk je demohost kw sy bo so; do

   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)
   eval "$f() { [[ $HOSTNAME == $f ]]; }"
 done
 codename=$(debian-codename)


@@ -308,8 +310,8 @@ set +x
 err-allow
 source /etc/profile.d/environment.sh
 export LC_USEBASHRC=t
 err-allow
 source /etc/profile.d/environment.sh
 export LC_USEBASHRC=t

-# shellcheck source=./.bashrc
-source ~/.bashrc
+# shellcheck source=./brc
+source ~/brc

 err-catch
 $interactive || set -x
 
 err-catch
 $interactive || set -x
 


@@ -382,7 +384,7 @@ if [[ -e $f ]]; then
       fi
     fi
   done
       fi
     fi
   done

-  if $apparmor_reload && systemctl is-enabled apparmor; then
+  if $apparmor_reload && systemctl is-active apparmor; then

     m ser reload apparmor
   fi
 fi
     m ser reload apparmor
   fi
 fi


@@ -551,7 +553,7 @@ fi
 # disabled temporarily
 ###### setup /i
 # if home_network; then
 # disabled temporarily
 ###### setup /i
 # if home_network; then

-#   tu /etc/fstab <<'EOF'
+#   sudo /a/exe/teeu /etc/fstab <<'EOF'

 # /i/w  /w  none  bind,noauto  0 0
 # /i/k  /k  none  bind,noauto  0 0
 # EOF
 # /i/w  /w  none  bind,noauto  0 0
 # /i/k  /k  none  bind,noauto  0 0
 # EOF


@@ -560,11 +562,11 @@ fi
 #     sudo chown $USER:user2 /kr
 #   fi
 #   if [[ $HOSTNAME == frodo ]]; then
 #     sudo chown $USER:user2 /kr
 #   fi
 #   if [[ $HOSTNAME == frodo ]]; then

-#     tu /etc/fstab <<'EOF'
+#     sudo /a/exe/teeu /etc/fstab <<'EOF'

 # /k  /kr  none  bind,noauto  0 0
 # EOF
 #   else
 # /k  /kr  none  bind,noauto  0 0
 # EOF
 #   else

-#     tu /etc/fstab <<'EOF'
+#     sudo /a/exe/teeu /etc/fstab <<'EOF'

 # frodo:/k  /kr  nfs  noauto  0 0
 # EOF
 #   fi
 # frodo:/k  /kr  nfs  noauto  0 0
 # EOF
 #   fi


@@ -634,7 +636,7 @@ if has_btrfs; then
     fi
 
     first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)
     fi
 
     first_root_crypt=$(awk '$2 == "/" {print $1}' /etc/mtab)

-    tu /etc/fstab <<EOF
+    sudo /a/exe/teeu /etc/fstab <<EOF

 $first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( (( $(nproc) > 2)) && echo ,compress=zstd )  0 0
 EOF
     sudo mkdir -p $dir
 $first_root_crypt  /nocow  btrfs  noatime,subvol=nocow$( (( $(nproc) > 2)) && echo ,compress=zstd )  0 0
 EOF
     sudo mkdir -p $dir


@@ -647,7 +649,7 @@ fi
 
 case $HOSTNAME in
   kd)
 
 case $HOSTNAME in
   kd)

-    tu /etc/fstab <<'EOF'
+    sudo /a/exe/teeu /etc/fstab <<'EOF'

 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7  /d  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d  0 0
 /d/m /i  none  bind,compress=zstd  0 0
 EOF
 /dev/mapper/crypt_dev_ata-Samsung_SSD_870_QVO_8TB_S5VUNG0N900656V-part7  /d  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,compress=zstd,subvol=d  0 0
 /d/m /i  none  bind,compress=zstd  0 0
 EOF


@@ -663,7 +665,7 @@ EOF
     fi
     ;;
   frodo)
     fi
     ;;
   frodo)

-    tu /etc/fstab <<'EOF'
+    sudo /a/exe/teeu /etc/fstab <<'EOF'

 /dev/mapper/crypt_dev_ata-ata-Hitachi_HDS722020ALA330_JK1121YAG7SXWS-part1  /i  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvol=i  0 0
 EOF
     if ! mountpoint /i &>/dev/null; then
 /dev/mapper/crypt_dev_ata-ata-Hitachi_HDS722020ALA330_JK1121YAG7SXWS-part1  /i  btrfs  nofail,x-systemd.device-timeout=30s,x-systemd.mount-timeout=30s,noatime,subvol=i  0 0
 EOF
     if ! mountpoint /i &>/dev/null; then