From a40ec94d2425292687ead49eed34eb12c434787f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 9 Oct 2014 13:20:40 +0200 Subject: [PATCH] Import patches-unapplied version 2.252 to ubuntu/utopic-proposed Imported using git-ubuntu import. Changelog parent: c788aa8b1c8ea89c6d3dcec2b5b7b1d17993fc0a New changelog entries: [ 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. * * create /etc/hosts for ubuntu-core:system-image --- debian/changelog | 14 ++++++++++++++ .../ubuntu-core/hooks/06-handle_resolvconf.chroot | 3 --- .../hooks/56-handle_resolvconf.chroot.binary | 7 +++++++ live-build/ubuntu-core/includes.chroot/etc/hosts | 9 +++++++++ 4 files changed, 30 insertions(+), 3 deletions(-) delete mode 100755 live-build/ubuntu-core/hooks/06-handle_resolvconf.chroot create mode 100755 live-build/ubuntu-core/hooks/56-handle_resolvconf.chroot.binary create mode 100644 live-build/ubuntu-core/includes.chroot/etc/hosts diff --git a/debian/changelog b/debian/changelog index 5637b160..2a5b439d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 Thu, 09 Oct 2014 13:20:40 +0200 + +livecd-rootfs (2.251) utopic; urgency=low + + * create /etc/hosts for ubuntu-core:system-image + + -- Michael Vogt Thu, 09 Oct 2014 09:24:39 +0200 + livecd-rootfs (2.250) utopic; urgency=low * build system-image without recommends 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 diff --git a/live-build/ubuntu-core/includes.chroot/etc/hosts b/live-build/ubuntu-core/includes.chroot/etc/hosts new file mode 100644 index 00000000..81684340 --- /dev/null +++ b/live-build/ubuntu-core/includes.chroot/etc/hosts @@ -0,0 +1,9 @@ +127.0.0.1 localhost.localdomain localhost +::1 localhost6.localdomain6 localhost6 + +# The following lines are desirable for IPv6 capable hosts +::1 localhost ip6-localhost ip6-loopback +fe00::0 ip6-localnet +ff02::1 ip6-allnodes +ff02::2 ip6-allrouters +ff02::3 ip6-allhosts