Check for mke2fs in sbin dirs, configure path into linuxdisk plugin

Gbp-Pq: Name 0004-Check-for-mke2fs-in-sbin-dirs-configure-path-into-li.patch

diff --git a/configure.ac b/configure.ac
index 5f35baa243b1a368291f6524add4b1da8b58f8e5..f2481cd6e001db9fa8f0d6956d01022602c69914 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -444,13 +444,16 @@ dnl Check for mke2fs -d (used by linuxdisk plugin).  There are two
 dnl possible outcomes that we care about: (1) We have mke2fs and
 dnl it supports the -d option.  (2) We either don't have mke2fs
 dnl or it's too old to support the -d option (eg. on RHEL 7).
+AC_PATH_PROG([MKE2FS], [mke2fs], [no], [$PATH:/usr/local/sbin:/usr/sbin:/sbin])
+AC_MSG_CHECKING([for $MKE2FS supporting the -d option])
 mke2fs_with_d=no
-AC_MSG_CHECKING([for mke2fs supporting the -d option])
-AS_IF([mke2fs -V >/dev/null 2>&1], [
-    AS_IF([LANG=C mke2fs -d 2>&1 | grep -sq "option requires an argument"], [
+AS_IF([test $MKE2FS != no], [
+    AS_IF([LANG=C $MKE2FS -d 2>&1 | grep -sq "option requires an argument"], [
         mke2fs_with_d=yes
+        AC_DEFINE_UNQUOTED([MKE2FS], ["$MKE2FS"], [path to mke2fs binary])
     ])
 ])
+
 AC_MSG_RESULT([$mke2fs_with_d])
 AM_CONDITIONAL([HAVE_MKE2FS_WITH_D],[test "x$mke2fs_with_d" = "xyes"])
 

diff --git a/plugins/linuxdisk/filesystem.c b/plugins/linuxdisk/filesystem.c
index cb2d6ee9bbd76e2e8b14f72792653590db9afecf..5e138718e73d1a934478f8edc1c6d11c04907443 100644 (file)
--- a/plugins/linuxdisk/filesystem.c
+++ b/plugins/linuxdisk/filesystem.c
@@ -219,7 +219,7 @@ mke2fs (const char *filename)
     return -1;
   }
 
-  fprintf (fp, "mke2fs -q -F -t %s ", type);
+  fprintf (fp, MKE2FS " -q -F -t %s ", type);
   if (label) {
     fprintf (fp, "-L ");
     shell_quote (label, fp);