From 32cc9da6c03ba21307158821a4b846e26105cfab Mon Sep 17 00:00:00 2001 From: James Hunt Date: Mon, 6 Oct 2014 13:25:11 +0100 Subject: [PATCH] Import patches-unapplied version 2.249 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: e11f18b965f1af115101493aba8f091a1a873fb6 New changelog entries: * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove pre-existing /etc/resolv.conf. --- debian/changelog | 7 +++++++ live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d0d30b6..f65e6b84 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.249) utopic; urgency=medium + + * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove + pre-existing /etc/resolv.conf. + + -- James Hunt Mon, 06 Oct 2014 13:25:11 +0100 + livecd-rootfs (2.248) utopic; urgency=medium * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Configure diff --git a/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot b/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot index ef2d94c8..3da4e2cf 100755 --- a/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot +++ b/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot @@ -1,3 +1,3 @@ #!/bin/sh -x -ln -s /run/resolvconf/resolv.conf /etc/resolv.conf +ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf