From: Hilko Bengen <bengen@debian.org>
Date: Fri, 28 Feb 2020 13:16:06 +0000 (+0100)
Subject: Check for mke2fs in sbin dirs, configure path into linuxdisk plugin
X-Git-Tag: archive/raspbian/1.38.2-2+rpi1~2^2^2^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=5ef77ba12bf9fe0629ea5f941c98e0484c5950fb;p=nbdkit.git

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 2f63e89..5d8a1e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -694,12 +694,15 @@ 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
 AS_IF([test "$enable_linuxdisk" != "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([$MKE2FS -V >/dev/null 2>&1], [
+        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])
diff --git a/plugins/linuxdisk/filesystem.c b/plugins/linuxdisk/filesystem.c
index 3e4e2f3..92b064e 100644
--- 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);