Merge lp:~azzar1/update-notifier/fix-1761841-v2 into lp:update-notifier/ubuntu

[Andrea Azzarone]

Manually monitor the livepatch status file using GFileMonitor.

=== modified file 'debian/changelog'
--- debian/changelog	2018-04-09 11:35:24 +0000
+++ debian/changelog	2018-04-18 16:01:42 +0000
@@ -1,3 +1,11 @@
+update-notifier (3.191) UNRELEASED; urgency=medium
+
+  * src/update-notifier.h: Add LIVEPATCH_FILE and livepatch_pending.
+  * src/update-notifier.c: Monitor the livepatch status file too
+    and show notification if needed (LP: #1761841).
+
+ -- Andrea Azzarone <[e-mail]>  Wed, 18 Apr 2018 17:54:10 +0200
+
 update-notifier (3.190) bionic; urgency=medium
 
   * Add missing build-dependency on dh-python

=== modified file 'src/update-notifier.c'
--- src/update-notifier.c	2017-09-06 09:31:58 +0000
+++ src/update-notifier.c	2018-04-18 16:01:42 +0000
@@ -189,6 +189,14 @@
         g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, NULL);
 }
 
+void livepatch_check()
+{
+        g_debug("livepatch_check ()");
+        gchar *argv[2];
+        argv[0] = "/usr/lib/update-notifier/livepatch-notification";
+        argv[1] = NULL;
+        g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, NULL, NULL, NULL, NULL);
+}
 
 static gboolean
 trayapplet_create (TrayApplet *ta, UpgradeNotifier *un, char *name)
@@ -257,6 +265,10 @@
       g_debug_inotify("avahi disabled due to unicast .local domain");
       un->unicast_local_avahi_pending = TRUE;
    }
+   if(strstr(info_uri, LIVEPATCH_FILE)) {
+      g_debug_inotify("livepatch status changed");
+      un->livepatch_pending = TRUE;
+   }
 }
 
 /*
@@ -268,6 +280,7 @@
  * - hook_pending: we have new upgrade hook information
  * - crashreport_pending: we have a new crashreport
  * - unicast_local_avahi_pending: avahi got disabled due to a unicast .local domain
+ * - livepatch_pending: livepatch status changed
  *
  */
 static gboolean
@@ -352,6 +365,12 @@
       un->unicast_local_avahi_pending = FALSE;
    }
 
+  if(un->livepatch_pending) {
+      g_debug("checking for livepatch status now");
+      livepatch_check ();
+      un->livepatch_pending = FALSE;
+   } 
+
    // reset the bitfields (for the next "time-slice")
    un->dpkg_was_run = FALSE;
    un->apt_get_running = FALSE;
@@ -395,6 +414,7 @@
       "/var/lib/update-notifier/dpkg-run-stamp",
       "/var/lib/apt/periodic/update-success-stamp",
       UNICAST_LOCAL_AVAHI_FILE,
+      LIVEPATCH_FILE,
       NULL};
    for(i=0;monitor_files[i] != NULL;i++) {
       if (getenv("UPSTART_SESSION") && monitor_files[i] == UNICAST_LOCAL_AVAHI_FILE) {

=== modified file 'src/update-notifier.h'
--- src/update-notifier.h	2016-07-20 17:23:40 +0000
+++ src/update-notifier.h	2018-04-18 16:01:42 +0000
@@ -45,6 +45,7 @@
 #define CRASHREPORT_REPORT_APP "/usr/share/apport/apport-gtk"
 #define CRASHREPORT_DIR "/var/crash/"
 #define UNICAST_LOCAL_AVAHI_FILE "/run/avahi-daemon/disabled-for-unicast-local"
+#define LIVEPATCH_FILE "/var/snap/canonical-livepatch/current/status"
 
 // security update autolaunch minimal time (12h)
 #define AUTOLAUNCH_MINIMAL_SECURITY_INTERVAL 12*60*60
@@ -105,6 +106,7 @@
    gboolean hook_pending;
    gboolean crashreport_pending;
    gboolean unicast_local_avahi_pending;
+   gboolean livepatch_pending;
    time_t last_apt_action;
 
 };