merged lp:~jamesodhunt/livecd-rootfs/system-image-really-fix-resolvconf-for-ubuntu-core

This commit is contained in:
Michael Vogt 2014-10-09 13:21:19 +02:00
commit 026fcaffe5
3 changed files with 15 additions and 3 deletions

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (2.252) utopic; urgency=low
[ 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. *
-- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Oct 2014 13:20:40 +0200
livecd-rootfs (2.251) utopic; urgency=low
* create /etc/hosts for ubuntu-core:system-image

View File

@ -1,3 +0,0 @@
#!/bin/sh -x
ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf

View File

@ -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