[Resolvconf-devel] Bug#749405: resolvconf: /etc/resolvconf/run/interface either does not exist or is not a directory

[Martin Pitt]

Hey Andre,

Beck, Andre [2014-06-01 16:24 +0200]:
> Pondering this a bit more, I've changed my copy in /etc/systemd/system
> to now read
> 
> WantedBy=sysinit.target
> 
> as this is reflecting better where Debian has placed networking and
> resolvconf traditionally - in rcS.d.

This indeed seems to be an adequate place, and it reflects
"Default-Start: S" of the SysV init script indeed.

network.target is implemented by NetworkManager, but we should indeed
not assume that this is installed. Sorry, I only tested this unit on
NM enabled systems.

The attached debdiff adjusts the WantedBy and cleans up the symlinks
on upgrade. It's not actively harmful to have two, but it might look a
bit confusing. Note that "systemctl reenable" also works when systemd
is not running, thus the postinst only checks if the systemctl command
exists.

@Thomas: You'll have to adjust the version comparison in the postinst
to whichever version you are going to upload that fixes this.

Thanks, and sorry for the trouble,

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru resolvconf-1.69ubuntu2/debian/changelog resolvconf-1.69ubuntu3/debian/changelog
--- resolvconf-1.69ubuntu2/debian/changelog	2014-04-26 17:27:02.000000000 +0200
+++ resolvconf-1.69ubuntu3/debian/changelog	2014-06-02 08:31:15.000000000 +0200
@@ -1,3 +1,13 @@
+resolvconf (1.69ubuntu3) utopic; urgency=medium
+
+  * resolvconf.service: Install into sysinit.target, not network.target, to
+    better reflect what the SysV init script does and to avoid depending on
+    NetworkManager. (Closes: #749405)
+  * debian/postinst: Clean up the redundant and obsolete network.target.wants
+    symlink on upgrade.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Mon, 02 Jun 2014 08:24:48 +0200
+
 resolvconf (1.69ubuntu2) utopic; urgency=medium
 
   * Add systemd unit (Closes: #700846)
diff -Nru resolvconf-1.69ubuntu2/debian/postinst resolvconf-1.69ubuntu3/debian/postinst
--- resolvconf-1.69ubuntu2/debian/postinst	2013-01-18 17:50:36.000000000 +0100
+++ resolvconf-1.69ubuntu3/debian/postinst	2014-06-02 08:35:59.000000000 +0200
@@ -145,6 +145,11 @@
 	# ;;
 esac
 
+# clean up after #749405
+if dpkg --compare-versions "$2" lt-nl "1.69ubuntu3" && type systemctl > /dev/null 2>&1; then
+	systemctl reenable resolvconf
+fi
+
 #DEBHELPER#
 
 exit 0
diff -Nru resolvconf-1.69ubuntu2/debian/resolvconf.service resolvconf-1.69ubuntu3/debian/resolvconf.service
--- resolvconf-1.69ubuntu2/debian/resolvconf.service	2014-04-23 16:59:43.000000000 +0200
+++ resolvconf-1.69ubuntu3/debian/resolvconf.service	2014-06-02 08:23:52.000000000 +0200
@@ -11,4 +11,4 @@
 ExecStop=/sbin/resolvconf --disable-updates
 
 [Install]
-WantedBy=network.target
+WantedBy=sysinit.target
-------------- 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/20140602/6d075d3d/attachment.sig>