X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;ds=sidebyside;f=filesystem%2Fusr%2Flocal%2Fbin%2Fmyupgrade;h=f2c5aec0850209d76f080b98559c8f752be3b189;hb=d67edcdca8795a4bca116aa532d02dda246a6f53;hp=f204796b25c3ebf50f0195f09f3f0d8305c62db4;hpb=0f9a999aa601cd77343a3e08cf0c6c4f9f943813;p=distro-setup

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index f204796..f2c5aec 100755
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -29,6 +29,11 @@ d() {
   fi
 }
 myreboot() {
+  if [[ -e /tmp/myupgrade-noreboot ]]; then
+    e "would rebooted but /tmp/myupgrade-noreboot exists"
+    return
+  fi
+
   for x in {30..1}; do
     echo "pid $$. unattended upgrade, rebooting in $((x*10)) seconds" | wall -n 2>/dev/null
     sleep 10
@@ -86,7 +91,7 @@ sleep 1
 # 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 ! /sbin/needrestart -p &>/dev/null; then
   if [[ $hn == "$MAIL_HOST" || $hn == kd ]]; then
     # send us an email so we can decide what to do
     needrestart -r l