Merge lp:~seb128/update-notifier/systemd into lp:update-notifier/ubuntu

[Sebastien Bacher]

  * debian/update-notifier-cds.conf:
    - use a valid variable to get the device name
  * debian/systemd, debian/update-notifier.install,links,crash:
    - convert the crash, unicast and release jobs to systemd
  * debian/systemd/update-notifier-cds.override,
    debian/systemd/update-notifier-hp-firmware.override,
    debian/update-notifier.install:
    - disable the cd-upgrade and hp-firware jobs under systemd,
      they are not important and need more work

  * debian/update-notifier-cds.conf:
    - use a valid variable to get the device name
  * debian/systemd, debian/update-notifier.install,links,crash:
    - convert the crash, unicast and release jobs to systemd
  * debian/systemd/update-notifier-cds.override,
    debian/systemd/update-notifier-hp-firmware.override,
    debian/update-notifier.install:
    - disable the cd-upgrade and hp-firware jobs under systemd,
      they are not important and need more work

[Martin Pitt (pitti)]

Looks mostly good, thanks for working on this! I found some nitpicks.

review: Needs Fixing

[lp:~seb128/update-notifier/systemd]

882. By Sebastien Bacher on 2016-07-20

tweak the systems jobs to fix the issues pointed in the review
* src/avahi.c, src/update.c, src/update-notifier.h,
  - use /run instead of /var/run

[Sebastien Bacher (seb128)]

thanks for the review, updated version up for review!

[Martin Pitt (pitti)]

Thanks, looks great now! Just one more nitpick about LP refs in the changelog.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-07-11 22:05:34 +0000
+++ debian/changelog	2016-07-20 16:52:23 +0000
@@ -1,3 +1,19 @@
+update-notifier (3.171) UNRELEASED; urgency=medium
+
+  * debian/update-notifier-cds.conf:
+    - use a valid variable to get the device name
+  * debian/systemd, debian/update-notifier.install,links,crash:
+    - convert the crash, unicast and release jobs to systemd
+  * debian/systemd/update-notifier-cds.override,
+    debian/systemd/update-notifier-hp-firmware.override,
+    debian/update-notifier.install:
+    - disable the cd-upgrade and hp-firware jobs under systemd, 
+      they are not important and need more work
+  * src/avahi.c, src/update.c, src/update-notifier.h,
+    - use /run instead of /var/run
+
+ -- Sebastien Bacher <[e-mail]>  Wed, 20 Jul 2016 17:29:30 +0200
+
 update-notifier (3.170) yakkety; urgency=medium
 
   * data/apt_check.py: use pkg.get_fullname() instead of pkg.name so that

=== added directory 'debian/systemd'
=== added file 'debian/systemd/unicast-local-avahi.override'
--- debian/systemd/unicast-local-avahi.override	1970-01-01 00:00:00 +0000
+++ debian/systemd/unicast-local-avahi.override	2016-07-20 16:52:23 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/systemd/unicast-local-avahi.path'
--- debian/systemd/unicast-local-avahi.path	1970-01-01 00:00:00 +0000
+++ debian/systemd/unicast-local-avahi.path	2016-07-20 16:52:23 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path trigger for Avahi .local domain notifications
+PartOf=graphical-session.target
+
+[Path]
+PathChanged=/run/avahi-daemon/disabled-for-unicast-local

=== added file 'debian/systemd/unicast-local-avahi.service'
--- debian/systemd/unicast-local-avahi.service	1970-01-01 00:00:00 +0000
+++ debian/systemd/unicast-local-avahi.service	2016-07-20 16:52:23 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Notification regarding avahi disabled due to .local domain
+
+[Service]
+ExecStart=/usr/lib/update-notifier/local-avahi-notification
+Type=oneshot

=== added file 'debian/systemd/update-notifier-cds.override'
--- debian/systemd/update-notifier-cds.override	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-cds.override	2016-07-20 16:52:23 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/systemd/update-notifier-crash.override'
--- debian/systemd/update-notifier-crash.override	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-crash.override	2016-07-20 16:52:23 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/systemd/update-notifier-crash.path'
--- debian/systemd/update-notifier-crash.path	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-crash.path	2016-07-20 16:52:23 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path trigger for Apport crash notifications
+PartOf=graphical-session.target
+
+[Path]
+PathChanged=/var/crash/

=== added file 'debian/systemd/update-notifier-crash.service'
--- debian/systemd/update-notifier-crash.service	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-crash.service	2016-07-20 16:52:23 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Notification regarding a crash report
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/lib/update-notifier/update-notifier-crash
+Type=oneshot

=== added file 'debian/systemd/update-notifier-hp-firmware.override'
--- debian/systemd/update-notifier-hp-firmware.override	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-hp-firmware.override	2016-07-20 16:52:23 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/systemd/update-notifier-release.override'
--- debian/systemd/update-notifier-release.override	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-release.override	2016-07-20 16:52:23 +0000
@@ -0,0 +1,1 @@
+manual

=== added file 'debian/systemd/update-notifier-release.path'
--- debian/systemd/update-notifier-release.path	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-release.path	2016-07-20 16:52:23 +0000
@@ -0,0 +1,6 @@
+[Unit]
+Description=Path trigger for new release of Ubuntu notifications
+PartOf=graphical-session.target
+
+[Path]
+PathChanged=/var/lib/ubuntu-release-upgrader/release-upgrade-available

=== added file 'debian/systemd/update-notifier-release.service'
--- debian/systemd/update-notifier-release.service	1970-01-01 00:00:00 +0000
+++ debian/systemd/update-notifier-release.service	2016-07-20 16:52:23 +0000
@@ -0,0 +1,7 @@
+[Unit]
+Description=Notification regarding a new release of Ubuntu
+PartOf=graphical-session.target
+
+[Service]
+ExecStart=/usr/lib/ubuntu-release-upgrader/check-new-release-gtk
+Type=oneshot

=== modified file 'debian/unicast-local-avahi.conf'
--- debian/unicast-local-avahi.conf	2013-04-02 16:57:34 +0000
+++ debian/unicast-local-avahi.conf	2016-07-20 16:52:23 +0000
@@ -2,7 +2,7 @@
 author "Brian Murray <[e-mail]>"
 
 start on (
-    file FILE=/var/run/avahi-daemon/disabled-for-unicast-local EVENT=create
+    file FILE=/run/avahi-daemon/disabled-for-unicast-local EVENT=create
 )
 
 

=== modified file 'debian/update-notifier-cds.conf'
--- debian/update-notifier-cds.conf	2015-01-20 09:34:45 +0000
+++ debian/update-notifier-cds.conf	2016-07-20 16:52:23 +0000
@@ -13,7 +13,7 @@
 DATE=$(date)
 echo "$DATE CD found at $DEVNAME"
 sleep 10
-MOUNTPOINT=$(printf $(awk "{if (\$1 == \"$D\") {print \$2}}" /proc/mounts ))
+MOUNTPOINT=$(printf $(awk "{if (\$1 == \"$DEVNAME\") {print \$2}}" /proc/mounts ))
 echo "CD mounted at $MOUNTPOINT"
 if [ -L "$MOUNTPOINT/ubuntu" ] || [ -e "$MOUNTPOINT/cdromupgrade" ]
 then

=== added file 'debian/update-notifier-crash'
--- debian/update-notifier-crash	1970-01-01 00:00:00 +0000
+++ debian/update-notifier-crash	2016-07-20 16:52:23 +0000
@@ -0,0 +1,13 @@
+#!/bin/sh
+set -e
+
+if /usr/share/apport/apport-checkreports; then
+    /usr/share/apport/apport-gtk
+else
+    if /usr/share/apport/apport-checkreports --system; then
+        if groups | grep -qE "sudo|admin" ; then
+            /usr/lib/update-notifier/system-crash-notification
+        fi
+    fi
+fi
+

=== modified file 'debian/update-notifier.install'
--- debian/update-notifier.install	2013-06-04 17:06:19 +0000
+++ debian/update-notifier.install	2016-07-20 16:52:23 +0000
@@ -10,8 +10,23 @@
 usr/bin/distro-cd-updater usr/lib/update-notifier/
 usr/bin/local-avahi-notification usr/lib/update-notifier/
 usr/bin/system-crash-notification usr/lib/update-notifier/
+# upstart jobs
 debian/update-notifier-cds.conf usr/share/upstart/sessions/
 debian/update-notifier-hp-firmware.conf usr/share/upstart/sessions/
 debian/unicast-local-avahi.conf usr/share/upstart/sessions/
 debian/update-notifier-release.conf usr/share/upstart/sessions/
 debian/update-notifier-crash.conf usr/share/upstart/sessions/
+#systemd units
+debian/systemd/update-notifier-crash.path usr/lib/systemd/user
+debian/systemd/update-notifier-crash.service usr/lib/systemd/user
+debian/update-notifier-crash usr/lib/update-notifier/
+debian/systemd/unicast-local-avahi.path usr/lib/systemd/user
+debian/systemd/unicast-local-avahi.service usr/lib/systemd/user
+debian/systemd/update-notifier-release.path usr/lib/systemd/user
+debian/systemd/update-notifier-release.service usr/lib/systemd/user
+# disable upstart job under systemd sessions
+debian/systemd/unicast-local-avahi.override usr/share/upstart/systemd-session/upstart/
+debian/systemd/update-notifier-crash.override usr/share/upstart/systemd-session/upstart/
+debian/systemd/update-notifier-hp-firmware.override usr/share/upstart/systemd-session/upstart/
+debian/systemd/update-notifier-release.override usr/share/upstart/systemd-session/upstart/
+debian/systemd/update-notifier-cds.override usr/share/upstart/systemd-session/upstart/

=== added file 'debian/update-notifier.links'
--- debian/update-notifier.links	1970-01-01 00:00:00 +0000
+++ debian/update-notifier.links	2016-07-20 16:52:23 +0000
@@ -0,0 +1,3 @@
+usr/lib/systemd/user/update-notifier-crash.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-crash.path
+usr/lib/systemd/user/unicast-local-avahi.path usr/lib/systemd/user/graphical-session.target.wants/unicast-local-avahi.path
+usr/lib/systemd/user/update-notifier-release.path usr/lib/systemd/user/graphical-session.target.wants/update-notifier-release.path

=== modified file 'src/avahi.c'
--- src/avahi.c	2015-09-08 05:29:07 +0000
+++ src/avahi.c	2016-07-20 16:52:23 +0000
@@ -37,7 +37,7 @@
     bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
     bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
     textdomain(GETTEXT_PACKAGE);
-    if (g_file_test ("/var/run/avahi-daemon/disabled-for-unicast-local", G_FILE_TEST_EXISTS)) {
+    if (g_file_test ("/run/avahi-daemon/disabled-for-unicast-local", G_FILE_TEST_EXISTS)) {
         show_notification();
         return 0;
     } else

=== modified file 'src/update-notifier.h'
--- src/update-notifier.h	2013-06-25 17:47:48 +0000
+++ src/update-notifier.h	2016-07-20 16:52:23 +0000
@@ -44,7 +44,7 @@
 #define CRASHREPORT_HELPER "/usr/share/apport/apport-checkreports"
 #define CRASHREPORT_REPORT_APP "/usr/share/apport/apport-gtk"
 #define CRASHREPORT_DIR "/var/crash/"
-#define UNICAST_LOCAL_AVAHI_FILE "/var/run/avahi-daemon/disabled-for-unicast-local"
+#define UNICAST_LOCAL_AVAHI_FILE "/run/avahi-daemon/disabled-for-unicast-local"
 
 // security update autolaunch minimal time (12h)
 #define AUTOLAUNCH_MINIMAL_SECURITY_INTERVAL 12*60*60

=== modified file 'src/update.c'
--- src/update.c	2016-05-25 14:40:44 +0000
+++ src/update.c	2016-07-20 16:52:23 +0000
@@ -612,7 +612,7 @@
    
    g_debug_update("%s returned %i (security: %i)", UPGRADE_CHECKER, priv->num_upgrades, priv->num_security);
 
-   if (stat("/var/run/reboot-required", &buf) == 0) {
+   if (stat("/run/reboot-required", &buf) == 0) {
       priv->reboot_pending = TRUE;
       g_debug_update("A reboot is currently pending.");
    }