X-Git-Url: https://git.grml.org/?p=grml-debootstrap.git;a=blobdiff_plain;f=grml-debootstrap;h=5b5ad449315aed17dff8082107919276c6231bc8;hp=9a6775436e2878f6473be56cd8ed52741eafa8ee;hb=ff11fa235c412826e9474946c7b74c5080a2ffaf;hpb=10ad4699c352b3537625085370051b9be83d2036

diff --git a/grml-debootstrap b/grml-debootstrap
index 9a67754..5b5ad44 100755
--- a/grml-debootstrap
+++ b/grml-debootstrap
@@ -794,7 +794,7 @@ efi_support() {
     return 0
   fi
 
-  if modprobe efivars ; then
+  if modprobe efivars &>/dev/null ; then
     einfo "EFI support enabled now." ; eend 0
     return 0
   fi
@@ -1055,6 +1055,24 @@ mkfs() {
         einfo "Enabling force option (-F) for mkfs.ext* tool as requested via --force switch."
         MKFS_OPTS="$MKFS_OPTS -F"
         eend 0
+
+        ;;
+    esac
+  fi
+
+  # starting with e2fsprogs 1.43~WIP.2015.05.18-1 mkfs.ext4 enables the metadata_csum feature
+  # by default, which requires a recent version of tune2fs on the target system then,
+  # so disable this feature for older Debian releases where it's known to be unsupported
+  if [ -n "$MKFS" ] && [ "$MKFS" = "mkfs.ext4" ] ; then
+    case "$RELEASE" in
+      lenny|squeeze|wheezy|jessie)
+        # assume a more recent version if we can't identify the version via dpkg-query
+        local e2fsprogs_version="$(dpkg-query --show --showformat='${Version}' e2fsprogs 2>/dev/null || echo 1.44)"
+        if [ -n "$e2fsprogs_version" ] && dpkg --compare-versions "$e2fsprogs_version" ge '1.43~WIP.2015.05.18-1' ; then
+          einfo "Disabling metadata_csum feature for $MKFS as $RELEASE doesn't support it."
+          MKFS_OPTS="$MKFS_OPTS -O ^metadata_csum"
+          eend 0
+        fi
         ;;
     esac
   fi