summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Cohen <bencoh@notk.org>2012-05-13 00:44:18 +0200
committerBenjamin Cohen <bencoh@notk.org>2012-05-13 00:44:18 +0200
commit61d00eebb0428375ea0d3c15072ebe39076ed74f (patch)
tree7262e2614e375f5616debf08e76038085989cc36
parent724370c8dbf38569b09a662730900da5ca13c6f2 (diff)
Debian bootstrap: fix 724370c8d
- use cp -rf --parents - fix locales configuration
-rwxr-xr-xbootstrap/debian/bootstrap.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/bootstrap/debian/bootstrap.sh b/bootstrap/debian/bootstrap.sh
index 0fc98c2..51c21a6 100755
--- a/bootstrap/debian/bootstrap.sh
+++ b/bootstrap/debian/bootstrap.sh
@@ -30,7 +30,7 @@ BOOTSTRAP_CACHE="$CACHE_DIR/$BOOTSTRAP_FLAVOR-$DPKG_ARCH-debootstrap.tar"
function bs_copy_from_host()
{
local FILE="$1"
- cp --parents "$FILE" "$MNTDIR"
+ cp -rf --parents "$FILE" "$MNTDIR"
}
function bs_copy_conf_dir()
@@ -151,6 +151,7 @@ EOF
cat >> "$BS_FILE" << EOF
update-locale
+locale-gen
aptitude update
@@ -158,6 +159,11 @@ echo "Bootstrap ended, halting"
} 2>&1 | /usr/bin/tee -a /var/log/bootstrap.log
exec /sbin/init 0
EOF
+
+ # Used by update-locale/locale-gen in BS_FILE
+ bs_copy_from_host /etc/default/locale
+ bs_copy_from_host /etc/locale.gen
+ bs_copy_from_host /etc/locale.alias
chmod +x "$BS_FILE"
@@ -197,9 +203,6 @@ EOF
bs_copy_from_host /etc/resolv.conf
bs_copy_from_host /etc/timezone || true
bs_copy_from_host /etc/localtime
- bs_copy_from_host /etc/default/locale
- bs_copy_from_host /etc/locale.gen
- bs_copy_from_host /etc/locale.alias
echo "$VM_NAME" > "$MNTDIR/etc/hostname"