Merge ~brian-murray/update-notifier:livepatch into update-notifier:master

[Brian Murray]

canonical-livepatch provides its own motd message regarding whether or not a reboot is required and if the only reason a reboot is required is due to a kernel update then we should use canonical-livepatch's message. Otherwise we should show the update-notifier reboot required message.

[William Wilson (jawn-smith)]

Looks good to me. I mocked up a fake /snap/bin/canonical-livepath to run through some different scenarios and it works as expected.

diff --git a/data/notify-reboot-required b/data/notify-reboot-required
index f2ecd7b..ed9985b 100644
--- a/data/notify-reboot-required
+++ b/data/notify-reboot-required
@@ -22,6 +22,29 @@ if [ "$0" = "/etc/kernel/postinst.d/update-notifier" ]; then
     DPKG_MAINTSCRIPT_PACKAGE=linux-base
 fi
 
+KERNEL_UPGRADED=0
+# Prefer showing the canonical-livepatch reboot message if one is required
+if [ -f "/snap/bin/canonical-livepatch" ]; then
+    # k-u-r returns 1 if livepatch isn't enabled or if a reboot isn't required
+    kur_rc=$(/snap/bin/canonical-livepatch kernel-upgrade-required 2> /dev/null)
+    if [ $? -eq 0 ]; then
+        exit 0;
+    elif [ $? -eq 1 ]; then
+        # status returns 1 if livepatch isn't enabled
+        status_rc=$(/snap/bin/canonical-livepatch status 2> /dev/null)
+        if [ $? -eq 0 ]; then
+            KERNEL_UPGRADED=1
+        fi
+    fi
+fi
+
+# while a reboot isn't required for the new kernel it might be for another package
+if [ $KERNEL_UPGRADED -eq 1 ]; then
+    if [ "$(echo $DPKG_MAINTSCRIPT_PACKAGE | cut -c1-5)" = "linux" ]; then
+        exit 0;
+    fi
+fi
+
 # Wake the applet up
 echo "*** $(eval_gettext "System restart required") ***" > /var/run/reboot-required
 echo "$DPKG_MAINTSCRIPT_PACKAGE" >> /var/run/reboot-required.pkgs