X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=23cf187cee819644f6cddd869f333bebdfdbd1e0;hp=59d89b4d5ca6a1ef599d41405d31ac528730d37b;hb=1c65ca6d6854e48535f9b18a5d6f3e82606c433f;hpb=3850bd70f2e8d6385d6ba38fe49b9008ab023f03

diff --git a/grml-debootstrap b/grml-debootstrap
index 59d89b4..23cf187 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -11,7 +11,7 @@ set -e # exit on any error
 
 # variables {{{
 PN="$(basename $0)"
-VERSION='0.27'
+VERSION='0.28'
 MNTPOINT="/mnt/debootstrap.$$"
 
 # inside the chroot system locales might not be available, so use minimum:
@@ -42,7 +42,7 @@ Bootstrap options:
   -r, --release <name>   Release of new Debian system (default: stable).
   -t, --target <target>  Target partition (/dev/...) or directory.
   -p, --mntpoint <mnt>   Mountpoint used for mounting the target system.
-      --debopt <params>  Extra parameters passed to the debootstrap.
+      --debopt <params>  Extra parameters passed to the debootstrap command.
       --interactive      Use interactive mode (frontend).
       --nodebootstrap    Skip debootstrap, only do configuration to the target.
       --groot <device>   Root device for usage in grub, corresponds with
@@ -514,8 +514,7 @@ interactive_mode()
 
   prompt_for_swraid
 
-  # do not prompt for partition dialog if swraid has been configured already
-  [ -n "$TARGET" ] || prompt_for_target
+  prompt_for_target
 
   prompt_for_bootmanager
 
@@ -676,6 +675,11 @@ stage() {
 
 # create filesystem {{{
 mkfs() {
+  if grep -q $TARGET /proc/mounts ; then
+     eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1
+     exit 1
+  fi
+
   if [ -n "$MKFS" ] ; then
      einfo "Running $MKFS on $TARGET"
      $MKFS $TARGET
@@ -701,7 +705,7 @@ mount_target() {
      einfo "Running grml-debootstrap on a directory, nothing to mount."
   else
      if grep -q $TARGET /proc/mounts ; then
-        eerror "$TARGET already mounted, exiting."
+        ewarn "$TARGET already mounted, continuing anyway." ; eend 0
      else
        [ -d "$MNTPOINT" ] || mkdir -p "$MNTPOINT"
        einfo "Mounting $TARGET to $MNTPOINT"