From 87cce5339e1b3bc0705919f7e88990a7058b9189 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Fri, 3 Nov 2006 18:00:17 +0100
Subject: [PATCH] prompt user for check of configuration before executing it

---
 chroot-script    |  2 +-
 grml-debootstrap | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/chroot-script b/chroot-script
index aa46874..0fcaa58 100644
--- a/chroot-script
+++ b/chroot-script
@@ -113,7 +113,7 @@ if [ -n "$GROOT" ] ; then
    update-grub -y
 
    if [ -z "$MBR" ] ; then
-      echo "Notice: \$MBR not set, not install grub therefore."
+      echo "Notice: \$MBR not set, will not install grub therefor."
    else
       cp /proc/mounts /etc/mtab
       grub-install "$MBR"
diff --git a/grml-debootstrap b/grml-debootstrap
index bea4922..b7c234f 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:49:46 CET 2006 [mika]
+# Latest change: Fre Nov 03 17:59:33 CET 2006 [mika]
 ################################################################################
 # http://www.debian.org/releases/stable/i386/apcs04.html.en
 
@@ -45,6 +45,22 @@ if [ -z "$TARGET" ] ; then
    exit 1
 fi
 
+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]
+
+Notice: continuing will delete all data from $TARGET
+"
+einfo "Is this ok? [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 +75,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
-- 
2.1.4