diff -Nru systemd-219/debian/changelog systemd-219/debian/changelog
--- systemd-219/debian/changelog 2015-04-02 02:08:56.000000000 -0600
+++ systemd-219/debian/changelog 2015-04-02 22:43:47.000000000 -0600
@@ -1,3 +1,10 @@
+systemd (219-6ubuntu2) vivid; urgency=medium
+
+ * debian/systemd.{triggers,postinst}: Trigger a systemctl daemon-reload
+ when init scripts are installed, so we are aware of the new services.
+
+ -- Adam Conrad <adconrad@ubuntu.com> Thu, 02 Apr 2015 22:42:25 -0600
+
systemd (219-6ubuntu1) vivid; urgency=medium
* Merge with Debian experimental branch. Remaining Ubuntu changes:
diff -Nru systemd-219/debian/systemd.postinst systemd-219/debian/systemd.postinst
--- systemd-219/debian/systemd.postinst 2015-04-02 02:08:56.000000000 -0600
+++ systemd-219/debian/systemd.postinst 2015-04-02 23:05:12.000000000 -0600
@@ -12,9 +12,19 @@
journalctl --update-catalog || true
}
-# Update Message Catalogs database in response to dpkg trigger
+# Update Message Catalogs database and reload in response to dpkg triggers
if [ "$1" = "triggered" ]; then
- _update_catalog
+ shift
+ for trigger in "$@"; do
+ case $trigger in
+ /usr/lib/systemd/catalog)
+ _update_catalog
+ ;;
+ /etc/init.d)
+ _systemctl daemon-reload
+ ;;
+ esac
+ done
exit 0
fi
diff -Nru systemd-219/debian/systemd.triggers systemd-219/debian/systemd.triggers
--- systemd-219/debian/systemd.triggers 2015-04-02 02:08:56.000000000 -0600
+++ systemd-219/debian/systemd.triggers 2015-04-02 22:41:49.000000000 -0600
@@ -1 +1,2 @@
interest-noawait /usr/lib/systemd/catalog
+interest-noawait /etc/init.d