X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=dea48b7d528f8cec1fffbcfa13d1959a87dbedf9;hp=3b4e3c2ceb59d3393f6c0d898aad07ed78c86099;hb=760de504295d5651e57b4c994da4ebb67403ba29;hpb=4ec5f76f8539f910d101d5674c860252e0bfd9f1

diff --git a/grml-debootstrap b/grml-debootstrap
index 3b4e3c2..dea48b7 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:31:47 CET 2006 [mika]
+# Latest change: Mon Nov 06 15:57:52 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -13,7 +13,7 @@ set -e # exit on any error
 . /etc/grml/lsb-functions
 . /etc/grml/script-functions
 
-VERSION='0.1'
+VERSION='0.2'
 
 case $* in
    -h*|--h*)
@@ -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,11 +41,29 @@ 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:  $GROOT / $GRUB  [if empty grub will not be installed]
+
+   Important! Continuing will delete all data from ${TARGET}!
+"
+einfon "Is this ok for you? [y/N] "
+
+read a
+if ! [ "$a" = 'y' -o "$a" = 'Y' ] ; then
+   eerror "Exiting as requested." ; eend 1
+   exit 1
+fi
+
 if [ -n "$MKFS" ] ; then
    einfo "Running $MKFS on $TARGET"
    $MKFS $TARGET
@@ -59,9 +78,11 @@ fi
 
 # now mount the new partition
 if grep -q $TARGET /proc/mounts ; then
-   eerror "$TARGEt already mounted, exiting."
+   eerror "$TARGET already mounted, exiting."
 else
+  [ -n "$MNTPOINT" ] || MNTPOINT='/mnt/test'
   einfo "Mounting $TARGET to $MNTPOINT"
+  [ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
   mount -o rw,suid,dev $TARGET $MNTPOINT
   eend $?
 fi
@@ -80,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/
@@ -92,6 +119,19 @@ 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 $?
+
+if [ -z "$GRUB" -o -z "$GROOT" ] ; then
+   echo "Notice: \$GRUB or \$GROOT not defined, will not install grub therefor."
+else
+   einfo "Installing grub on ${GRUB}:"
+   grub-install --root-directory="$MNTPOINT" "(${GRUB})"
+   eend $?
+fi
+
 einfo "Unmount $MNTPOINT"
 umount $MNTPOINT
 eend $?