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

Proposed by Timo Jyrinki on 2014-04-17
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378
Merge into: lp:ubuntu/trusty/resolvconf
Diff against target: 41 lines (+20/-3)
2 files modified
debian/changelog (+9/-0)
debian/preinst (+11/-3)
To merge this branch: bzr merge lp:~timo-jyrinki/ubuntu/trusty/resolvconf/fix_lp_1308378
Reviewer Review Type Date Requested Status
Ubuntu branches 2014-04-17 Pending
Review via email: mp+216300@code.launchpad.net

Commit message

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)

Description of the change

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.

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-01-18 16:52:12 +0000
3+++ debian/changelog 2014-04-17 12:18:33 +0000
4@@ -1,3 +1,12 @@
5+resolvconf (1.69ubuntu1.1) trusty; urgency=medium
6+
7+ * debian/preinst: On 12.04 LTS the system works without /etc/resolv.conf.
8+ Upon upgrading such a system to 14.04 LTS network stops working.
9+ Therefore, create a symlink upon upgrade from resolvconf <= 1.64 in the
10+ case that /etc/resolv.conf does not exist at all. (LP: #1308378)
11+
12+ -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 17 Apr 2014 14:45:17 +0300
13+
14 resolvconf (1.69ubuntu1) raring; urgency=low
15
16 * Merge from Debian. Remaining changes: (LP: #1085756)
17
18=== modified file 'debian/preinst'
19--- debian/preinst 2012-05-03 22:52:01 +0000
20+++ debian/preinst 2014-04-17 12:18:33 +0000
21@@ -56,9 +56,17 @@
22 fi
23 fi
24 ;;
25- # upgrade)
26- # Don't do anything
27- # ;;
28+ upgrade)
29+ # On 12.04 LTS the system works without /etc/resolv.conf. Upon upgrading
30+ # such a system to 14.04 LTS network stops working. Therefore, create a
31+ # symlink upon upgrade from resolvconf <= 1.64 in the case that
32+ # /etc/resolv.conf does not exist at all. (LP: #1308378)
33+ if dpkg --compare-versions "$2" lt 1.64 ; then
34+ if [ ! -e /etc/resolv.conf ]; then
35+ ln -nsf ../run/resolvconf/resolv.conf /etc/resolv.conf
36+ fi
37+ fi
38+ ;;
39 # abort-upgrade)
40 # Don't do anything because we don't anything in the postrm on upgrade or on failed-upgrade
41 # ;;

Subscribers

People subscribed via source and target branches

to all changes: