mostly profanity and fixes

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

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index fb8d1d05643c05b9ffb87a13d96024a1de74ce14..b86e418c64b259a0423754ea8d25c6416c4bdf01 100755 (executable)
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -25,12 +25,13 @@ d() {
   if [[ $DEBUG ]]; then
     pee cat "wall -n"
   else
-    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,13 +41,27 @@ 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 $HOSTNAME 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.