X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=2e1a1dcc6747a4ec774fd70479a8f82108db7fd0;hp=98e0e0edea042543bbcb7c8edc5fc3340612caeb;hb=90028449ca7de91e7a88cf843a1f7d352c3dc172;hpb=3264c61424d611142919f18593370b3012dc8a44

diff --git a/grml-debootstrap b/grml-debootstrap
index 98e0e0e..2e1a1dc 100644
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -4,7 +4,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Fre Nov 03 21:35:09 CET 2006 [mika]
+# Latest change: Mon Nov 06 12:31:46 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -104,6 +104,9 @@ einfo "Preparing chroot system"
   # make sure we can access network [relevant for cdebootstrap]
   [ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
 
+  # setup default locales
+  [ -n "$LOCALES" ] && cp /etc/debootstrap/locale.gen  $MNTPOINT/etc/locale.gen
+
   # copy any existing existing files to chroot
   [ -d /etc/debootstrap/boot  ] && cp -a /etc/debootstrap/boot/*  $MNTPOINT/boot/
   [ -d /etc/debootstrap/etc   ] && cp -a /etc/debootstrap/etc/*   $MNTPOINT/etc/
@@ -117,13 +120,22 @@ chroot $MNTPOINT /bin/chroot-script
 eend $?
 
 # einfo "Removing chroot-script"
-# rm -f $MNTPOINT/bin/chroot-script
+# rm -f  $MNTPOINT/bin/chroot-script
+# rm -rf $MNTPOINT/etc/debootstrap/
 # eend $?
 
 einfo "Unmount $MNTPOINT"
 umount $MNTPOINT
 eend $?
 
+if [ -z "$MBR" ] ; then
+   echo "Notice: \$MBR not set, will not install grub therefor."
+else
+   einfo "Installing grub on ${MBR}:"
+   grub-install --root-directory="$MNTPOINT" "(${MBR})"
+   eend $?
+fi
+
 if [ "$FSCK" = 'yes' ] ; then
    [ -n "$FSCKTOOL" ] || FSCKTOOL="fsck.${MKFS#mkfs.}"
    einfo "Checking filesystem on $TARGET using $FSCKTOOL"