Manually apply #92 on new finalize script used to build V3 base boxes

This commit is contained in:
Fabio Rehm 2013-06-27 01:30:18 -03:00
parent 36f8472614
commit c3e6eb4e51
2 changed files with 14 additions and 6 deletions

View file

@ -66,12 +66,19 @@ EOF
$hostname
EOF
# set the host in case it is not set so that sudo does not complain about the host
if ! (grep -q $hostname $rootfs/etc/hosts); then
chroot $rootfs sed -i -e \
"s/^127.0.0.1\(\s\+\)localhost$/127.0.0.1\1localhost\n127.0.0.1\1${hostname}/g" \
/etc/hosts >/dev/null 2>&1 || true
fi
# set minimal hosts
cat <<EOF > $rootfs/etc/hosts
127.0.0.1 localhost
127.0.1.1 $hostname
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback
fe00::0 ip6-localnet
ff00::0 ip6-mcastprefix
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
ff02::3 ip6-allhosts
EOF
# set default locale
cat <<EOF > $rootfs/etc/locale.gen

View file

@ -67,6 +67,7 @@ fe00::0 ip6-localnet
ff00::0 ip6-mcastprefix
ff02::1 ip6-allnodes
ff02::2 ip6-allrouters
ff02::3 ip6-allhosts
EOF
if [ ! -f $rootfs/etc/init/container-detect.conf ]; then