[Resolvconf-devel] Bug#700846: Fixed and tested .service and debdiff, version 2

[Martin Pitt]

Martin Pitt [2014-04-23 16:06 +0200]:
> > RequiresMountsFor=/run
> 
> Consulting #systemd: This seems redundant as systemd mounts /run
> before running any unit. But it doesn't hurt, so I left it in for now.

Removed now. Lennart Poettering confirmed that it is a no-op.

I also dropped the Conflicts=shutdown.target. If this was supposed to
actively block shutdown until resolvconf --disable-updates finished,
it would need a corresponding Before=shutdown.target. However, it's
not actually necessary to do anything on shutdown as everything is on
a tmpfs. So we can save these cycles.

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru resolvconf-1.69ubuntu1/debian/changelog resolvconf-1.69ubuntu1pitti2/debian/changelog
--- resolvconf-1.69ubuntu1/debian/changelog	2013-01-18 17:52:11.000000000 +0100
+++ resolvconf-1.69ubuntu1pitti2/debian/changelog	2014-04-23 16:59:49.000000000 +0200
@@ -1,3 +1,9 @@
+resolvconf (1.69ubuntu1pitti2) trusty; urgency=medium
+
+  * Add systemd unit (Closes: #700846)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Wed, 23 Apr 2014 15:56:57 +0200
+
 resolvconf (1.69ubuntu1) raring; urgency=low
 
   * Merge from Debian. Remaining changes: (LP: #1085756)
diff -Nru resolvconf-1.69ubuntu1/debian/control resolvconf-1.69ubuntu1pitti2/debian/control
--- resolvconf-1.69ubuntu1/debian/control	2013-01-18 17:28:38.000000000 +0100
+++ resolvconf-1.69ubuntu1pitti2/debian/control	2014-04-23 16:50:24.000000000 +0200
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 XSBC-Original-Maintainer: resolvconf maintainers <resolvconf-devel at lists.alioth.debian.org>
 Uploaders: Thomas Hood <jdthood at yahoo.co.uk>, Marco Nenciarini <mnencia at debian.org>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8), dh-systemd
 Homepage: http://alioth.debian.org/projects/resolvconf/
 Vcs-Git: git://git.debian.org/git/resolvconf/resolvconf.git
 Vcs-Browser: http://git.debian.org/?p=resolvconf/resolvconf.git
diff -Nru resolvconf-1.69ubuntu1/debian/resolvconf.service resolvconf-1.69ubuntu1pitti2/debian/resolvconf.service
--- resolvconf-1.69ubuntu1/debian/resolvconf.service	1970-01-01 01:00:00.000000000 +0100
+++ resolvconf-1.69ubuntu1pitti2/debian/resolvconf.service	2014-04-23 16:59:43.000000000 +0200
@@ -0,0 +1,14 @@
+[Unit]
+Description=Nameserver information manager
+Documentation=man:resolvconf(8)
+DefaultDependencies=no
+
+[Service]
+RemainAfterExit=yes
+ExecStartPre=/bin/mkdir -p /run/resolvconf/interface
+ExecStartPre=/bin/touch /run/resolvconf/postponed-update
+ExecStart=/sbin/resolvconf --enable-updates
+ExecStop=/sbin/resolvconf --disable-updates
+
+[Install]
+WantedBy=network.target
diff -Nru resolvconf-1.69ubuntu1/debian/rules resolvconf-1.69ubuntu1pitti2/debian/rules
--- resolvconf-1.69ubuntu1/debian/rules	2012-12-13 19:27:08.000000000 +0100
+++ resolvconf-1.69ubuntu1pitti2/debian/rules	2014-04-23 16:50:24.000000000 +0200
@@ -35,7 +35,9 @@
 	dh_installdocs README
 	dh_installman
 	dh_installchangelogs
+	dh_systemd_enable
 	dh_installinit -r
+	dh_systemd_start -r
 	dh_installppp --name=000resolvconf
 	dh_installifupdown --name=resolvconf
 	dh_installifupdown --name=000resolvconf
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/resolvconf-devel/attachments/20140423/dede3eaa/attachment.sig>