diff options
| author | qzdanis <[email protected]> | 2020-12-03 13:01:16 -0500 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2020-12-23 13:08:30 -0800 |
| commit | 49ba502f9960cb26d4cf552777f0ccdff1a94848 (patch) | |
| tree | 1946f427718682d5c69cf21efa22954d2b8c14b2 | |
| parent | 7735c9addf0fbcf6df2fae98a6af31c7e241b61c (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Quentin Zdanis <[email protected]>
Closes #11269
| -rw-r--r-- | config/always-sed.m4 | 2 | ||||
| -rw-r--r-- | config/deb.am | 2 | ||||
| -rwxr-xr-x | scripts/zfs-tests.sh | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/config/always-sed.m4 b/config/always-sed.m4 index 19633e118..3d7ae285b 100644 --- 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 81dc8a306..639a46efd 100644 --- 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 ea6dc7eb2..2ee1d08d3 100755 --- 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 # |