summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Cohen <bencoh@notk.org>2012-04-27 19:17:13 +0200
committerBenjamin Cohen <bencoh@notk.org>2012-04-27 19:17:13 +0200
commit724370c8dbf38569b09a662730900da5ca13c6f2 (patch)
tree369c2e4ba74ed795549ce0b206f3f3316f45e552
parent51448c00f9f206ad66040b14655aa53300b1a3c6 (diff)
debian bootstrap:
- use cp --parents - copy/generate locales from host
-rwxr-xr-xbootstrap/debian/bootstrap.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/bootstrap/debian/bootstrap.sh b/bootstrap/debian/bootstrap.sh
index 19d76ae..0fc98c2 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 -rf "$FILE" "$MNTDIR/$FILE"
+ cp --parents "$FILE" "$MNTDIR"
}
function bs_copy_conf_dir()
@@ -150,6 +150,8 @@ EOF
cat >> "$BS_FILE" << EOF
+update-locale
+
aptitude update
echo "Bootstrap ended, halting"
@@ -195,6 +197,9 @@ 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"