From 35e801f00a34855ac3946d76f8309e1d8a3d414d Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Mon, 2 Oct 2017 14:29:52 +0100 Subject: [PATCH] Drop obsolete fix-ups of resolv.conf, debootstrap should now result in correct symlink to resolved without any further fixes. --- debian/changelog | 7 +++++++ live-build/ubuntu-core/includes.chroot/etc/resolv.conf | 1 - .../ubuntu-desktop-next/includes.chroot/etc/resolv.conf | 1 - live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot | 3 --- 4 files changed, 7 insertions(+), 5 deletions(-) delete mode 120000 live-build/ubuntu-core/includes.chroot/etc/resolv.conf delete mode 120000 live-build/ubuntu-desktop-next/includes.chroot/etc/resolv.conf delete mode 100644 live-build/ubuntu-server/hooks/99-fix-resolvconf.chroot diff --git a/debian/changelog b/debian/changelog index b98312c1..b7a05aae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.465) 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.464) artful; urgency=medium * Ignore failure of new autopkgtest on ppc64el, where it's not a 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