live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove

pre-existing /etc/resolv.conf.
10 years ago · 8f00484d48
parent ec09c1b31c 7fdb47c749
commit 8f00484d48
2 changed files with 8 additions and 1 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 livecd-rootfs (2.249) UNRELEASED; urgency=medium
  * live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot: Remove
    pre-existing /etc/resolv.conf.
 -- James Hunt <james.hunt@ubuntu.com>  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
--- 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
`@ -1,3 +1,3 @@`
	`#!/bin/sh -x`	`#!/bin/sh -x`

	`ln -s /run/resolvconf/resolv.conf /etc/resolv.conf`	`ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf`