rename err to bash-bear

[distro-setup] / filesystem / usr / local / bin / myupgrade

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index c206f8f7888127295a9e08864d616360122d2b12..6c4ed879a7ee4baeb24c5e201e417534b967274b 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -9,7 +9,7 @@
 
 if [ -z "$BASH_VERSION" ]; then echo "error: shell is not bash" >&2; exit 1; fi
 
-source /usr/local/lib/err
+source /usr/local/lib/bash-bear
 pre="${0##*/}:"
 PATH="/sbin:$PATH"
 m() { printf "$pre %s\n"  "$*"; "$@"; }
@@ -25,12 +25,13 @@ d() {
   if [[ $DEBUG ]]; then
     pee cat "wall -n"
   else
-    echo ok | sed 's/^/myupgrade /' | pee logger "wall -n"
+    # 2>/dev/null hopefully gets rid of errors like: wall: /dev/pts/0: No such file or directory
+    sed 's/^/myupgrade /' | pee logger "wall -n" 2>/dev/null
   fi
 }
 myreboot() {
   for x in {30..1}; do
-    echo "pid $$. unattended upgrade, rebooting in $((x*10)) seconds" | wall -n
+    echo "pid $$. unattended upgrade, rebooting in $((x*10)) seconds" | wall -n 2>/dev/null
     sleep 10
   done
   for x in {30..1}; do
@@ -40,20 +41,57 @@ myreboot() {
       /sbin/reboot
       exit 0
     fi
-    echo "pid $$. unattended upgrade reboot waiting 10 seconds for dpkg lock" | wall -n
+    echo "pid $$. unattended upgrade reboot waiting 10 seconds for dpkg lock" | wall -n 2>/dev/null
     sleep 10
   done
   echo "pid $$. dpkg locked for 5 minutes, automatic reboot failed" | d
 }
 
 
+case $hn in
+  kd)
+    /c/roles/prom/files/simple/usr/local/bin/fsf-install-prometheus
+    /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l 127.0.0.1
+    ;;
+  li|bk|je)
+    /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter -l 127.0.0.1
+    ;;
+  *)
+    /c/roles/prom_export/files/simple/usr/local/bin/fsf-install-node-exporter
+    ;;
+esac
+
+
 # TODO: executed from cron, this doesnt sent an email when we reboot,
 # because rebooting from the script stops the ability to send email.
 # We should figure some workaround.
 
-if ! out=$(/sbin/needrestart -p 2>&1); then
-  printf "%s\n\n" "$out"
-  if [[ $HOSTNAME != "$MAIL_HOST" ]]; then
+# I originally had the idea that for MAIL_HOST, I'd just send an email
+# if something needs restarting. But atm, I have a bad habit of ignoring
+# those emails.
+
+if ! needrestart -p -k &>/dev/null; then
+  myreboot
+fi
+
+needrestart -b -l -r a |& logger -t myupgrade
+sleep 1
+
+# Restart based on library doesnt always work. If we still
+# detect outdated libraries after trying to automatically restart,
+# then do a reboot unless we are on systems we care a bit more about
+# uptime, then send us an email.
+#
+# Note: I've noticed restart based on library has tended to screw up
+# desktop related daemons because they have bugs when restarted in
+# isolation instead of as part of bring up and down the whole desktop.
+# But, I'd rather something gets messed up than things not get
+# restarted.
+if ! /sbin/needrestart -p -l &>/dev/null; then
+  if [[ $hn == "$MAIL_HOST" || $hn == kd ]]; then
+    # send us an email so we can decide what to do
+    needrestart -r l
+  else
     myreboot
   fi
 fi