mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-03-15 13:21:15 +00:00
merged lp:~jamesodhunt/livecd-rootfs/system-image-really-fix-resolvconf-for-ubuntu-core
This commit is contained in:
commit
026fcaffe5
8
debian/changelog
vendored
8
debian/changelog
vendored
@ -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
|
||||
|
@ -1,3 +0,0 @@
|
||||
#!/bin/sh -x
|
||||
|
||||
ln -fs /run/resolvconf/resolv.conf /etc/resolv.conf
|
7
live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary
Executable file
7
live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary
Executable 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
|
Loading…
x
Reference in New Issue
Block a user