diff -Nru resolvconf-1.44/bin/resolvconf resolvconf-1.44ubuntu1/bin/resolvconf --- resolvconf-1.44/bin/resolvconf 2009-03-30 01:02:38.000000000 -0700 +++ resolvconf-1.44ubuntu1/bin/resolvconf 2009-06-03 08:14:10.000000000 -0700 @@ -21,6 +21,8 @@ report_err() { echo "${MYNAME}: Error: $*" >&2 ; } +[ -L /etc/resolv.conf ] || { report_err "/etc/resolv.conf must be a symlink"; exit 1; } + # Check arguments CMD="$1" case "$CMD" in diff -Nru resolvconf-1.44/debian/changelog resolvconf-1.44ubuntu1/debian/changelog --- resolvconf-1.44/debian/changelog 2009-06-02 15:02:23.000000000 -0700 +++ resolvconf-1.44ubuntu1/debian/changelog 2009-06-04 16:39:28.000000000 -0700 @@ -1,3 +1,15 @@ +resolvconf (1.44ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes (LP: #384131): + - bin/resolvconf: + + fail with non-zero exit code when /etc/resolv.conf is not a symlink. + - debian/postinst: + + use default /var/run. + - debian/rules: + + don't install the init script in runlevels 0 and 6. + + -- Nick Ellery Thu, 04 Jun 2009 16:38:43 -0700 + resolvconf (1.44) unstable; urgency=low [ Thomas Hood ] @@ -16,6 +28,18 @@ -- Daniel Kahn Gillmor Tue, 02 Jun 2009 18:02:23 -0400 +resolvconf (1.43ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #306092): + - bin/resolvconf: + + fail with non-zero exit code when /etc/resolv.conf is not a symlink. + - debian/postinst: + + use default /var/run. + - debian/rules: + + don't install the init script in runlevels 0 and 6. + + -- Nick Ellery Sun, 07 Dec 2008 15:12:34 -0800 + resolvconf (1.43) unstable; urgency=low [ Thomas Hood ] @@ -31,6 +55,27 @@ -- Marco Nenciarini Sat, 06 Dec 2008 10:17:36 +0100 +resolvconf (1.42ubuntu2) intrepid; urgency=low + + * bin/resolvconf: fail with non-zero exit code when /etc/resolv.conf is not + a symlink. This allows network-manager to recognize such an error and + fallback to default behaviour when resolvconf is installed, but is not + used. + + -- Alexander Sack Wed, 10 Sep 2008 10:08:56 +0200 + +resolvconf (1.42ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + + debian/postinst: + - use default /var/run. + + debian/rules: + - don't install the init script in runlevels 0 and 6 + + debian/control: + - Update Standards-Version. + + -- Emanuele Gentili Wed, 20 Aug 2008 02:32:47 +0200 + resolvconf (1.42) unstable; urgency=high [ Thomas Hood ] @@ -42,6 +87,14 @@ -- Thomas Hood Sun, 03 Aug 2008 21:27:56 +0200 +resolvconf (1.41ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: (LP: #241328) + + debian/postinst: use default /var/run. + + Update maintainer field in debian/control. + + -- Emanuele Gentili Thu, 19 Jun 2008 16:26:51 +0200 + resolvconf (1.41) unstable; urgency=low [ Thomas Hood ] @@ -64,6 +117,14 @@ -- Daniel Kahn Gillmor Tue, 17 Jun 2008 16:51:15 -0400 +resolvconf (1.40ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes (LP: #226679): + + debian/postinst: use default /var/run. + + Update maintainer field in debian/control. + + -- Emanuele Gentili Mon, 05 May 2008 00:23:04 +0200 + resolvconf (1.40) unstable; urgency=low [ Daniel Kahn Gillmor ] @@ -118,6 +179,14 @@ -- Marco Nenciarini Thu, 13 Mar 2008 12:48:18 +0100 +resolvconf (1.38ubuntu1) hardy; urgency=low + + * Merge from debian unstable, remaining changes (LP: #182433): + - use /var/run instead of /dev/shm + - debian/rules: don't install the init script in runlevels 0 and 6 + + -- Emanuele Gentili Sun, 13 Jan 2008 01:36:43 +0100 + resolvconf (1.38) unstable; urgency=low [ Thomas Hood ] @@ -136,6 +205,14 @@ -- Thomas Hood Tue, 31 Dec 2007 12:00:00 +0100 +resolvconf (1.37ubuntu1) feisty; urgency=low + + * Merge from debian unstable, remaining changes: + - use /var/run instead of /dev/shm + - debian/rules: don't install the init script in runlevels 0 and 6 + + -- Michael Bienia Tue, 19 Dec 2006 14:19:02 +0100 + resolvconf (1.37) unstable; urgency=high [ Thomas Hood ] @@ -150,6 +227,20 @@ -- Marco Nenciarini Wed, 13 Dec 2006 15:13:02 +0100 +resolvconf (1.36ubuntu1) edgy; urgency=low + + [ William Alexander Grant ] + * Readded patch to use /var/run rather than /dev/shm (it was lost in a sync + a while back) + (Closes Ubuntu: #61310). + + [ Daniel T. Chen ] + * debian/rules: Follow multiuser semantics for dh_installinit(1) -- + that is, we don't need to save anything for runlevels 0 or 6, so + don't create those symlinks. + + -- Daniel T Chen Wed, 20 Sep 2006 03:12:20 -0400 + resolvconf (1.36) unstable; urgency=low [ D.K. Gillmor / TH ] @@ -953,3 +1044,4 @@ * Initial Debian release. Closes: #204677 -- Thomas Hood Wed, 27 Aug 2003 17:53:54 -0100 + diff -Nru resolvconf-1.44/debian/control resolvconf-1.44ubuntu1/debian/control --- resolvconf-1.44/debian/control 2009-03-30 01:02:54.000000000 -0700 +++ resolvconf-1.44ubuntu1/debian/control 2009-06-04 16:38:39.000000000 -0700 @@ -1,14 +1,15 @@ Source: resolvconf Section: net Priority: optional -Maintainer: resolvconf maintainers +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: resolvconf maintainers Uploaders: Daniel Kahn Gillmor , Thomas Hood , Marco Nenciarini , Petter Reinholdtsen Build-Depends: debhelper (>= 5) Vcs-Svn: svn://svn.debian.org/resolvconf/resolvconf/trunk Vcs-Browser: http://svn.debian.org/wsvn/resolvconf/resolvconf/trunk Homepage: http://alioth.debian.org/projects/resolvconf/ Dm-Upload-Allowed: yes -Standards-Version: 3.8.0.0 +Standards-Version: 3.8.0 Package: resolvconf Architecture: all diff -Nru resolvconf-1.44/debian/postinst resolvconf-1.44ubuntu1/debian/postinst --- resolvconf-1.44/debian/postinst 2009-03-30 01:02:38.000000000 -0700 +++ resolvconf-1.44ubuntu1/debian/postinst 2009-06-03 08:14:10.000000000 -0700 @@ -18,7 +18,13 @@ # case "$1" in configure|reconfigure) - # If it's a symlink, ensure that it is canonicalizable + # The following remark is not true for Ubuntu: + # Unfortunately we can't keep state files in /var/run/ because + # resolvconf, as it must, initializes before networking does and + # /var/ can be on the network. + # End of remark. Ubuntu has a tmpfs at /var/run early. + # + # Only use an existing symlink if it is canonicalizable if [ -L /etc/resolvconf/run ] ; then RUN_CANONICALPATH="$(readlink -f /etc/resolvconf/run || :)" if [ -z "$RUN_CANONICALPATH" ] ; then @@ -58,20 +64,16 @@ # It's a dangling but canonicalizable symlink mkdir -v "$RUN_CANONICALPATH" "${RUN_CANONICALPATH}/interface" else - # It's nonexistent - # - # TODO: In order to ensure that this code is equivalent to the earlier block, - # put it into a function - # + # It's a nonexistent + # Use /var/run. if \ - [ -d /lib/init/rw ] \ - && [ -w /lib/init/rw ] \ - && [ -r /proc/mounts ] \ - && grep -qs "^tmpfs[[:space:]]\+/lib/init/rw[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ - && { [ -d /lib/init/rw/resolvconf ] || mkdir -v /lib/init/rw/resolvconf ; } \ - && { [ -d /lib/init/rw/resolvconf/interface ] || mkdir -v /lib/init/rw/resolvconf/interface ; } + [ -d /var/run ] \ + && [ -w /var/run ] \ + && grep -qs "^tmpfs[[:space:]]\+/var/run[[:space:]]\+tmpfs[[:space:]]\+\([^[:space:]]\+,\)\?rw" /proc/mounts \ + && { [ -d /var/run/resolvconf ] || mkdir -v /var/run/resolvconf ; } \ + && { [ -d /var/run/resolvconf/interface ] || mkdir -v /var/run/resolvconf/interface ; } then - ln -s /lib/init/rw/resolvconf /etc/resolvconf/run + ln -s /var/run/resolvconf /etc/resolvconf/run else mkdir -v /etc/resolvconf/run /etc/resolvconf/run/interface fi diff -Nru resolvconf-1.44/debian/rules resolvconf-1.44ubuntu1/debian/rules --- resolvconf-1.44/debian/rules 2009-03-30 01:02:38.000000000 -0700 +++ resolvconf-1.44ubuntu1/debian/rules 2009-06-03 08:14:10.000000000 -0700 @@ -27,7 +27,7 @@ dh_installdocs README dh_installman dh_installchangelogs - dh_installinit --no-start -- start 38 S . stop 89 0 6 . + dh_installinit --no-start -- start 07 S . dh_installppp --name=000resolvconf install --mode=0755 debian/resolvconf.000resolvconf.ifupdown.if-up $(DESTDIR)/etc/network/if-up.d/000resolvconf install --mode=0755 debian/resolvconf.resolvconf.ifupdown.if-down $(DESTDIR)/etc/network/if-down.d/resolvconf