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

7 years ago · d18cb38c4e
parent e6a0fd17be 35e801f00a
commit d18cb38c4e
4 changed files with 7 additions and 5 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
+livecd-rootfs (2.468) UNRELEASED; urgency=medium
+
+  * Drop obsolete fix-ups of resolv.conf, debootstrap should now result in
+    correct symlink to resolved without any further fixes.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 02 Oct 2017 14:29:11 +0100
+
 livecd-rootfs (2.467) artful; urgency=medium

  * fix remaining wrong references to /etc/default/grub.d/40-partuuid
--- a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
+++ b/live-build/ubuntu-core/includes.chroot/etc/resolv.conf
@ -1 +0,0 @@
-../run/resolvconf/resolv.conf
--- a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
+++ b/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf
@ -1 +0,0 @@
-../run/resolvconf/resolv.conf
--- a/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot
+++ b/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot
@ -1,3 +0,0 @@
-#!/bin/sh
-
-ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf