Support MKFS_OPTS variable + use -F option in mkfs.ext* when running in force mode

diff --git a/config b/config
index 7af583f..19e66b4 100644 (file)
--- a/config
+++ b/config
@@ -154,6 +154,10 @@
 # Default: 'mkfs.ext4'
 # MKFS=''
 
 # Default: 'mkfs.ext4'
 # MKFS=''
 

+# Command line options for file system creation tool.
+# Default: no default.
+# MKFS_OPTS=''
+

 # Filesystem tuning tool to apply on $TARGET.
 # If empty, the created file system will not be tuned.
 # Default: 'tune2fs -c0 -i0' if ext* filesystem is used, no default otherwise.
 # Filesystem tuning tool to apply on $TARGET.
 # If empty, the created file system will not be tuned.
 # Default: 'tune2fs -c0 -i0' if ext* filesystem is used, no default otherwise.

diff --git a/grml-debootstrap b/grml-debootstrap
index efb8501..a5c7ca6 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -29,6 +29,7 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -n "$LOCALES" ] || LOCALES='yes'
 [ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
 [ -n "$MKFS" ] || MKFS='mkfs.ext4'
 [ -n "$LOCALES" ] || LOCALES='yes'
 [ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
 [ -n "$MKFS" ] || MKFS='mkfs.ext4'

+[ -n "$MKFS_OPTS" ] || MKFS_OPTS=''

 [ -n "$PACKAGES" ] || PACKAGES='yes'
 [ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes'
 [ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'
 [ -n "$PACKAGES" ] || PACKAGES='yes'
 [ -n "$PRE_SCRIPTS" ] || PRE_SCRIPTS='yes'
 [ -n "$RECONFIGURE" ] || RECONFIGURE='console-data'


@@ -899,45 +900,57 @@ fi
 mkfs() {
   if [ -n "$DIRECTORY" ] ; then
      einfo "Running grml-debootstrap on a directory, skipping mkfs stage."
 mkfs() {
   if [ -n "$DIRECTORY" ] ; then
      einfo "Running grml-debootstrap on a directory, skipping mkfs stage."

-  else
-    if grep -q "$TARGET" /proc/mounts ; then
-      eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1
-      bailout 1
-    fi
+     return 0
+  fi

 
 

-    if [ -n "$MKFS" ] ; then
-       einfo "Running $MKFS on $TARGET"
-       $MKFS $TARGET ; RC=$?
-
-       if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
-         if ! echo "$MKFS" | grep -q "mkfs.ext" ; then
-           eerror "Not changing disk uuid for $TARGET because $MKFS doesn't seem to match for ext{2,3,4} file system"
-           eend 1
-           bailout 1
-         else
-           einfo "Changing disk uuid for $TARGET to fixed (non-random) value using tune2fs"
-           tune2fs "$TARGET" -U 26ada0c0-1165-4098-884d-aafd2220c2c6
-           eend $?
-         fi
-       fi
+  if grep -q "$TARGET" /proc/mounts ; then
+    eerror "$TARGET already mounted, exiting to avoid possible damage. (Manually unmount $TARGET)" ; eend 1
+    bailout 1
+  fi

 
 

-       # make sure /dev/disk/by-uuid/... is up2date, otherwise grub
-       # will fail to detect the uuid in the chroot
-       if echo "$TARGET" | grep -q "/dev/md" ; then
-         blockdev --rereadpt "${TARGET}"
-       elif ! [ -n "$VIRTUAL" ] ; then
-         blockdev --rereadpt "${TARGET%%[0-9]*}"
-       fi
-       # give the system 2 seconds, otherwise we might run into
-       # race conditions :-/
-       sleep 2
+  # mkfs.ext* might prompt with "/dev/sdX# contains a ext* file system
+  # created on ... Proceed anyway? (y,n)" which we want to skip in force mode
+  if [ -n "$MKFS" ] && [ -n "$FORCE" ] ; then
+    case "$MKFS" in
+      mkfs.ext*)
+        einfo "Enabling force option (-F) for mkfs.ext* tool as requested via --force switch."
+        MKFS_OPTS="$MKFS_OPTS -F"
+        eend 0
+        ;;
+    esac
+  fi

 
 

-       eval $(blkid -o udev $TARGET 2>/dev/null)
-       [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID=""
+  if [ -n "$MKFS" ] ; then
+    einfo "Running $MKFS $MKFS_OPTS on $TARGET"
+    $MKFS $MKFS_OPTS $TARGET ; RC=$?

 
 

-       eend $RC
+    if [ "$FIXED_DISK_IDENTIFIERS" = "yes" ] ; then
+      if ! echo "$MKFS" | grep -q "mkfs.ext" ; then
+        eerror "Not changing disk uuid for $TARGET because $MKFS doesn't seem to match for ext{2,3,4} file system"
+        eend 1
+        bailout 1
+      else
+        einfo "Changing disk uuid for $TARGET to fixed (non-random) value using tune2fs"
+        tune2fs "$TARGET" -U 26ada0c0-1165-4098-884d-aafd2220c2c6
+        eend $?
+      fi

     fi
 
     fi
 

+    # make sure /dev/disk/by-uuid/... is up2date, otherwise grub
+    # will fail to detect the uuid in the chroot
+    if echo "$TARGET" | grep -q "/dev/md" ; then
+      blockdev --rereadpt "${TARGET}"
+    elif ! [ -n "$VIRTUAL" ] ; then
+      blockdev --rereadpt "${TARGET%%[0-9]*}"
+    fi
+    # give the system 2 seconds, otherwise we might run into
+    # race conditions :-/
+    sleep 2
+
+    eval $(blkid -o udev $TARGET 2>/dev/null)
+    [ -n "$ID_FS_UUID" ] && TARGET_UUID="$ID_FS_UUID" || TARGET_UUID=""
+
+    eend $RC

   fi
 }
 # }}}
   fi
 }
 # }}}