Add compatibility for busybox mktemp

Busybox's mktemp requires at least six X's in the template, causing
the current sed --in-place check to fail because the file does not
exist. This change adds additional X's to mktemp templates that do
not already have at least six X's in them.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Quentin Zdanis <zdanisq@gmail.com>
Closes #11269

diff --git a/config/always-sed.m4 b/config/always-sed.m4
index 19633e118aedec449767242aa2d2ae6aa0006318..3d7ae285ba1b3327fc7acb96816cb8ffc30f5601 100644 (file)
--- a/config/always-sed.m4
+++ b/config/always-sed.m4
@@ -4,7 +4,7 @@ dnl #
 AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_SED], [
        AC_REQUIRE([AC_PROG_SED])dnl
        AC_CACHE_CHECK([for sed --in-place], [ac_cv_inplace], [
-               tmpfile=$(mktemp conftest.XXX)
+               tmpfile=$(mktemp conftest.XXXXXX)
                echo foo >$tmpfile
                AS_IF([$SED --in-place 's#foo#bar#' $tmpfile 2>/dev/null],
                      [ac_cv_inplace="--in-place"],

diff --git a/config/deb.am b/config/deb.am
index 81dc8a30650b235f1949d1f3a9b4b43e1922f944..639a46efddbf3d84915deef28311952e601550fa 100644 (file)
--- a/config/deb.am
+++ b/config/deb.am
@@ -53,7 +53,7 @@ deb-utils: deb-local rpm-utils-initramfs
 ## Arguments need to be passed to dh_shlibdeps. Alien provides no mechanism
 ## to do this, so we install a shim onto the path which calls the real
 ## dh_shlibdeps with the required arguments.
-       path_prepend=`mktemp -d /tmp/intercept.XXX`; \
+       path_prepend=`mktemp -d /tmp/intercept.XXXXXX`; \
        echo "#$(SHELL)" > $${path_prepend}/dh_shlibdeps; \
        echo "`which dh_shlibdeps` -- \
         -xlibuutil3linux -xlibnvpair3linux -xlibzfs4linux -xlibzpool4linux" \

diff --git a/scripts/zfs-tests.sh b/scripts/zfs-tests.sh
index f986edf76780071ce4595689f7626dd00736f935..45e08473d35cf5340664f0d906b22444c32446e8 100755 (executable)
--- a/scripts/zfs-tests.sh
+++ b/scripts/zfs-tests.sh
@@ -265,7 +265,7 @@ constrain_path() {
                create_links "$DIRS" "$ZFSTEST_FILES"
        else
                # Constrained path set to /var/tmp/constrained_path.*
-               SYSTEMDIR=${SYSTEMDIR:-/var/tmp/constrained_path.XXXX}
+               SYSTEMDIR=${SYSTEMDIR:-/var/tmp/constrained_path.XXXXXX}
                STF_PATH=$(mktemp -d "$SYSTEMDIR")
                STF_PATH_REMOVE="yes"
                STF_MISSING_BIN=""
@@ -663,11 +663,11 @@ export PATH=$STF_PATH
 
 if [ "$UNAME" = "FreeBSD" ] ; then
        mkdir -p "$FILEDIR" || true
-       RESULTS_FILE=$(mktemp -u "${FILEDIR}/zts-results.XXXX")
-       REPORT_FILE=$(mktemp -u "${FILEDIR}/zts-report.XXXX")
+       RESULTS_FILE=$(mktemp -u "${FILEDIR}/zts-results.XXXXXX")
+       REPORT_FILE=$(mktemp -u "${FILEDIR}/zts-report.XXXXXX")
 else
-       RESULTS_FILE=$(mktemp -u -t zts-results.XXXX -p "$FILEDIR")
-       REPORT_FILE=$(mktemp -u -t zts-report.XXXX -p "$FILEDIR")
+       RESULTS_FILE=$(mktemp -u -t zts-results.XXXXXX -p "$FILEDIR")
+       REPORT_FILE=$(mktemp -u -t zts-report.XXXXXX -p "$FILEDIR")
 fi
 
 #