X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=cd96f1ab2136645b2751b7695bc46a33845989b1;hp=b7c234f81629b1db0029724fb33d94c9c0cbe7f7;hb=be87c6d1ae33ce0792222b0ed438496ae9ae3b53;hpb=87cce5339e1b3bc0705919f7e88990a7058b9189

diff --git a/grml-debootstrap b/grml-debootstrap
index b7c234f..cd96f1a 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 17:59:33 CET 2006 [mika]
+# Latest change: Fre Nov 03 21:35:09 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -33,6 +33,7 @@ esac
 check4progs debootstrap || exit 1
 check4root || exit 1
 
+# without config file it won't work
 if [ -r /etc/debootstrap/config ] ; then
    . /etc/debootstrap/config
 else
@@ -40,20 +41,22 @@ else
    exit 1
 fi
 
+# make sure at least $TARGET is set [the partition for the new system]
 if [ -z "$TARGET" ] ; then
    eerror "Please adjust /etc/debootstrap/config before running ${0}" ; eend 1
    exit 1
 fi
 
+# user should recheck his configuration
 einfo "$0 - Please recheck configuration before execution:"
 echo "
-target partition: $TARGET
-mount-point:      $MNTPOINT
-install grub to:  $MBR / $GROOT [if empty it will not be installed]
+   Target partition: $TARGET
+   Mount-point:      $MNTPOINT
+   Install grub to:  $MBR / $GROOT [if empty it will not be installed]
 
-Notice: continuing will delete all data from $TARGET
+   Important! Continuing will delete all data from ${TARGET}!
 "
-einfo "Is this ok? [y/N]"
+einfon "Is this ok for you? [y/N] "
 
 read a
 if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
@@ -98,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/
@@ -110,6 +119,11 @@ 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 $?