X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=filesystem%2Fusr%2Flocal%2Fbin%2Fmyupgrade;h=712047a684e3ffc1de594b79d1eeefc1bae27924;hb=6f1f8a104c9b38936ade2d27e835479523985133;hp=b990fbb70c080db20d91855c4c1d46931cd54bc1;hpb=b1c29177fe76f8f2a557f7f36c987df3ef2a6cb4;p=distro-setup

diff --git a/filesystem/usr/local/bin/myupgrade b/filesystem/usr/local/bin/myupgrade
index b990fbb..712047a 100755
--- a/filesystem/usr/local/bin/myupgrade
+++ b/filesystem/usr/local/bin/myupgrade
@@ -13,8 +13,10 @@ if [[ $HOSTNAME == "$MAIL_HOST" || $hn == li.b8.nz ]]; then
   exit 0
 fi
 
-/usr/sbin/checkrestart -v -i bash -b /a/bin/distro-setup/checkrestart-blacklist | \
-  sed '/^Found 0 processes using old versions of upgraded files$/d' >/var/log/checkrestart.log
+cmd="$s /usr/sbin/checkrestart -p"
+if [[ $($cmd | sed '/^Found 0 processes using old versions of upgraded files$/d' | wc -l) != 0 ]]; then
+  $cmd -v | pee cat "wall -n"
+fi
 
 if [[ -s /var/log/checkrestart.log ]]; then
   for x in {30..1}; do
@@ -23,6 +25,7 @@ if [[ -s /var/log/checkrestart.log ]]; then
   done
   for x in {30..1}; do
     if ! fuser /var/lib/dpkg/lock &> /dev/null; then
+      echo "pid $PID. unattended upgrade, rebooting now" | pee cat "wall -n"
       /sbin/reboot
       exit 0
     fi