diff --git a/debian/changelog b/debian/changelog index 700173d2..42b1c584 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ livecd-rootfs (2.250) UNRELEASED; urgency=low + [ Michael Vogt ] * build system-image without recommends - -- Michael Vogt Tue, 07 Oct 2014 11:44:09 +0200 + [ James Hunt ] + * Convert resolvconf hook from a chroot hook to a binary hook since lb + overwrites /etc/resolv.conf after the chroot hooks have run. + + -- James Hunt Thu, 09 Oct 2014 11:41:55 +0100 livecd-rootfs (2.249) utopic; urgency=medium diff --git a/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot b/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot deleted file mode 100755 index 3da4e2cf..00000000 --- a/live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -x - -ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf diff --git a/live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary b/live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary new file mode 100755 index 00000000..d92dfd43 --- /dev/null +++ b/live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary @@ -0,0 +1,7 @@ +#!/bin/sh -x +#--------------------------------------------------------------------- +# this must be run as a binary hook (outside the chroot) since lb +# massages resolv.conf on finishing the chroot operations. +#--------------------------------------------------------------------- + +ln -fs /run/resolvconf/resolv.conf chroot/etc/resolv.conf