Merge lp:~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378 into lp:ubuntu/trusty/resolvconf

[Timo Jyrinki]

debian/preinst: On 12.04 LTS the system works without /etc/resolv.conf.
Upon upgrading such a system to 14.04 LTS network stops working.
Therefore, create a symlink upon upgrade from resolvconf <= 1.64 in the
case that /etc/resolv.conf does not exist at all. (LP: #1308378)

The proposed branch adds upgrade) preinst rule for resolvconf < 1.64, and creates the symlink if and only if /etc/resolv.conf does not exist at all (normal file or symlink). I've tested that it does nothing when upgrading from newer resolvconf, and also leaves /etc/resolv.conf untouched if it exists as a normal file or a symlink, when upgrading from the precise version. It fixes the issue I saw on upgrade.

[Sebastien Bacher (seb128)]

setting as merged, it looks like that got uploaded (but you should check the bug report, there is a new comment that indicates the update is creating issues for some users)

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-18 16:52:12 +0000
+++ debian/changelog	2014-04-17 12:18:33 +0000
@@ -1,3 +1,12 @@
+resolvconf (1.69ubuntu1.1) trusty; urgency=medium
+
+  * debian/preinst: On 12.04 LTS the system works without /etc/resolv.conf.
+    Upon upgrading such a system to 14.04 LTS network stops working. 
+    Therefore, create a symlink upon upgrade from resolvconf <= 1.64 in the 
+    case that /etc/resolv.conf does not exist at all. (LP: #1308378)
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 17 Apr 2014 14:45:17 +0300
+
 resolvconf (1.69ubuntu1) raring; urgency=low
 
   * Merge from Debian. Remaining changes: (LP: #1085756)
 
=== modified file 'debian/preinst'
--- debian/preinst	2012-05-03 22:52:01 +0000
+++ debian/preinst	2014-04-17 12:18:33 +0000
@@ -56,9 +56,17 @@
 		fi
 	fi
 	;;
-  # upgrade)
-	# Don't do anything
-	# ;;
+  upgrade)
+	# On 12.04 LTS the system works without /etc/resolv.conf. Upon upgrading 
+	# such a system to 14.04 LTS network stops working. Therefore, create a
+	# symlink upon upgrade from resolvconf <= 1.64 in the case that 
+	# /etc/resolv.conf does not exist at all. (LP: #1308378)
+	if dpkg --compare-versions "$2" lt 1.64 ; then
+		if [ ! -e /etc/resolv.conf ]; then
+			ln -nsf ../run/resolvconf/resolv.conf /etc/resolv.conf
+		fi
+	fi
+	;;
   # abort-upgrade)
 	# Don't do anything because we don't anything in the postrm on upgrade or on failed-upgrade
 	# ;;