Switch default filesystem from ext3 to ext4

It should be safe to default to ext4 nowadays with Debian/wheezy
being the stable Debian release.

diff --git a/config b/config
index 53ff8ec..f98dff6 100644 (file)
--- a/config
+++ b/config
@@ -151,7 +151,7 @@
 
 # File system creation tool to apply on $TARGET.
 # If empty, no file system will be created.
 
 # File system creation tool to apply on $TARGET.
 # If empty, no file system will be created.

-# Default: 'mkfs.ext3'
+# Default: 'mkfs.ext4'

 # MKFS=''
 
 # Filesystem tuning tool to apply on $TARGET.
 # MKFS=''
 
 # Filesystem tuning tool to apply on $TARGET.

diff --git a/grml-debootstrap b/grml-debootstrap
index 9cd82a7..576a8b6 100755 (executable)
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -27,7 +27,7 @@ MNTPOINT="/mnt/debootstrap.$$"
 [ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes'
 [ -n "$LOCALES" ] || LOCALES='yes'
 [ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"
 [ -n "$INSTALL_NOTES" ] || INSTALL_NOTES='/etc/debootstrap/install_notes'
 [ -n "$LOCALES" ] || LOCALES='yes'
 [ -n "$MIRROR" ] || MIRROR="$FALLBACK_MIRROR"

-[ -n "$MKFS" ] || MKFS='mkfs.ext3'
+[ -n "$MKFS" ] || MKFS='mkfs.ext4'

 [ -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'


@@ -982,7 +982,7 @@ prepare_vm() {
     dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
     eend $?
   fi
     dd if="${MBRTMPFILE}" of="${TARGET}" conv=notrunc
     eend $?
   fi

-  parted -s "${TARGET}" 'mkpart primary ext3 2M -1'
+  parted -s "${TARGET}" 'mkpart primary ext4 2M -1'

 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"
 
   # if dm-mod isn't available then kpartx will fail with
   # "Is device-mapper driver missing from kernel? [...]"

diff --git a/grml-debootstrap.8.txt b/grml-debootstrap.8.txt
index 24dd4ae..4f6fa97 100644 (file)
--- a/grml-debootstrap.8.txt
+++ b/grml-debootstrap.8.txt
@@ -76,7 +76,7 @@ Options and environment variables
 *--filesystem* _filesystem_::
 
     Filesystem that should be created when installing to a partition.
 *--filesystem* _filesystem_::
 
     Filesystem that should be created when installing to a partition.

-    If unset defaults to ext3. Valid values are all filesystems that
+    If unset defaults to ext4. Valid values are all filesystems that

     can be created through mkfs._filesystem_.
 
 *--force*::
     can be created through mkfs._filesystem_.
 
 *--force*::