Merge lp:~xnox/livecd-rootfs/drop-harmful-resolv-fixes into lp:livecd-rootfs

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Steve Langasek
Approved revision: 1540
Merged at revision: 1547
Proposed branch: lp:~xnox/livecd-rootfs/drop-harmful-resolv-fixes
Merge into: lp:livecd-rootfs
Diff against target: 26 lines (+7/-3)
2 files modified
debian/changelog (+7/-0)
live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot (+0/-3)
To merge this branch: bzr merge lp:~xnox/livecd-rootfs/drop-harmful-resolv-fixes
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Ubuntu Core Development Team Pending
Review via email: mp+331652@code.launchpad.net

Description of the change

Drop harful fix ups of resolv.conf

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

+1. Is there a bug number related to this? I.e., you say they're "harmful" fix-ups, what is the harm and where has it been reported?

review: Approve

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 2017-10-01 20:39:22 +0000
3+++ debian/changelog 2017-10-02 13:31:51 +0000
4@@ -1,3 +1,10 @@
5+livecd-rootfs (2.465) UNRELEASED; urgency=medium
6+
7+ * Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
8+ correct symlink to resolved without any further fixes.
9+
10+ -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 02 Oct 2017 14:29:11 +0100
11+
12 livecd-rootfs (2.464) artful; urgency=medium
13
14 * Ignore failure of new autopkgtest on ppc64el, where it's not a
15
16=== removed symlink 'live-build/ubuntu-core/includes.chroot/etc/resolv.conf'
17=== target was u'../run/resolvconf/resolv.conf'
18=== removed symlink 'live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf'
19=== target was u'../run/resolvconf/resolv.conf'
20=== removed file 'live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot'
21--- live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot 2017-03-21 00:57:45 +0000
22+++ live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot 1970-01-01 00:00:00 +0000
23@@ -1,3 +0,0 @@
24-#!/bin/sh
25-
26-ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf

Subscribers

People subscribed via source and target branches