diff --git a/debian/changelog b/debian/changelog index 946fbfad..c8f455c8 100644 --- 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 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 diff --git a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf b/live-build/ubuntu-core/includes.chroot/etc/resolv.conf deleted file mode 120000 index 0141cbbf..00000000 --- a/live-build/ubuntu-core/includes.chroot/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -../run/resolvconf/resolv.conf \ No newline at end of file diff --git a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf b/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf deleted file mode 120000 index 0141cbbf..00000000 --- a/live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf +++ /dev/null @@ -1 +0,0 @@ -../run/resolvconf/resolv.conf \ No newline at end of file diff --git a/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot b/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot deleted file mode 100644 index 9ed0a499..00000000 --- a/live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -ln -snf ../run/resolvconf/resolv.conf /etc/resolv.conf