X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=2e1a1dcc6747a4ec774fd70479a8f82108db7fd0;hp=024c33f1acd3566647a647b086f97212a58f2c3c;hb=90028449ca7de91e7a88cf843a1f7d352c3dc172;hpb=d01d89592be4e0cb1d4669fddca3d0da9a66cc4f

diff --git a/grml-debootstrap b/grml-debootstrap
index 024c33f..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 18:05:56 CET 2006 [mika]
+# Latest change: Mon Nov 06 12:31:46 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -101,6 +101,12 @@ einfo "Preparing chroot system"
   cp /etc/debootstrap/config $MNTPOINT/etc/debootstrap/
   cp /etc/debootstrap/packages $MNTPOINT/etc/debootstrap/packages
 
+  # 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/
@@ -113,10 +119,23 @@ einfo "Executing chroot-script now"
 chroot $MNTPOINT /bin/chroot-script
 eend $?
 
+# einfo "Removing 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"