72 lines
2.9 KiB
Diff
72 lines
2.9 KiB
Diff
|
From e50f91e6004a523d745179eaa789e28a75ff06d4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Harald Hoyer <harald@redhat.com>
|
||
|
|
Date: Tue, 14 Jul 2015 10:11:59 +0200
|
||
|
|
Subject: [PATCH] use mktemp "-p" instead of "--tmpdir" for busybox
|
||
|
|
|
||
|
|
---
|
||
|
|
dracut-logger.sh | 2 +-
|
||
|
|
dracut.sh | 10 +++++-----
|
||
|
|
test/test-functions | 2 +-
|
||
|
|
3 files changed, 7 insertions(+), 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/dracut-logger.sh b/dracut-logger.sh
|
||
|
|
index 2a6019c..e5c9358 100755
|
||
|
|
--- a/dracut-logger.sh
|
||
|
|
+++ b/dracut-logger.sh
|
||
|
|
@@ -148,7 +148,7 @@ dlog_init() {
|
||
|
|
&& type -P systemd-cat &>/dev/null \
|
||
|
|
&& systemctl --quiet is-active systemd-journald.socket &>/dev/null \
|
||
|
|
&& { echo "dracut-$DRACUT_VERSION" | systemd-cat -t 'dracut' &>/dev/null; } ; then
|
||
|
|
- readonly _dlogdir="$(mktemp --tmpdir="$TMPDIR/" -d -t dracut-log.XXXXXX)"
|
||
|
|
+ readonly _dlogdir="$(mktemp -p "$TMPDIR/" -d -t dracut-log.XXXXXX)"
|
||
|
|
readonly _systemdcatfile="$_dlogdir/systemd-cat"
|
||
|
|
mkfifo "$_systemdcatfile"
|
||
|
|
readonly _dlogfd=15
|
||
|
|
diff --git a/dracut.sh b/dracut.sh
|
||
|
|
index b7456dc..ee0a039 100755
|
||
|
|
--- a/dracut.sh
|
||
|
|
+++ b/dracut.sh
|
||
|
|
@@ -777,16 +777,16 @@ fi
|
||
|
|
[[ $reproducible == yes ]] && DRACUT_REPRODUCIBLE=1
|
||
|
|
|
||
|
|
readonly TMPDIR="$tmpdir"
|
||
|
|
-readonly initdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initramfs.XXXXXX)"
|
||
|
|
+readonly initdir="$(mktemp -p "$TMPDIR/" -d -t initramfs.XXXXXX)"
|
||
|
|
[ -d "$initdir" ] || {
|
||
|
|
- printf "%s\n" "dracut: mktemp --tmpdir='$TMPDIR/' -d -t initramfs.XXXXXX failed." >&2
|
||
|
|
+ printf "%s\n" "dracut: mktemp -p '$TMPDIR/' -d -t initramfs.XXXXXX failed." >&2
|
||
|
|
exit 1
|
||
|
|
}
|
||
|
|
|
||
|
|
if [[ $early_microcode = yes ]] || ( [[ $acpi_override = yes ]] && [[ -d $acpi_table_dir ]] ); then
|
||
|
|
- readonly early_cpio_dir="$(mktemp --tmpdir="$TMPDIR/" -d -t early_cpio.XXXXXX)"
|
||
|
|
+ readonly early_cpio_dir="$(mktemp -p "$TMPDIR/" -d -t early_cpio.XXXXXX)"
|
||
|
|
[ -d "$early_cpio_dir" ] || {
|
||
|
|
- printf "%s\n" "dracut: mktemp --tmpdir='$TMPDIR/' -d -t early_cpio.XXXXXX failed." >&2
|
||
|
|
+ printf "%s\n" "dracut: mktemp -p '$TMPDIR/' -d -t early_cpio.XXXXXX failed." >&2
|
||
|
|
exit 1
|
||
|
|
}
|
||
|
|
fi
|
||
|
|
@@ -1614,7 +1614,7 @@ dinfo "*** Creating image file '$outfile' ***"
|
||
|
|
|
||
|
|
if [[ $uefi = yes ]]; then
|
||
|
|
uefi_outfile="$outfile"
|
||
|
|
- readonly uefi_outdir="$(mktemp --tmpdir="$TMPDIR/" -d -t initrd.XXXXXX)"
|
||
|
|
+ readonly uefi_outdir="$(mktemp -p "$TMPDIR/" -d -t initrd.XXXXXX)"
|
||
|
|
# redirect initrd output
|
||
|
|
outfile="$uefi_outdir/initrd"
|
||
|
|
fi
|
||
|
|
diff --git a/test/test-functions b/test/test-functions
|
||
|
|
index 1f5eed5..2b8a4d2 100644
|
||
|
|
--- a/test/test-functions
|
||
|
|
+++ b/test/test-functions
|
||
|
|
@@ -4,7 +4,7 @@ export PATH
|
||
|
|
|
||
|
|
[[ -e .testdir ]] && . .testdir
|
||
|
|
if [[ -z "$TESTDIR" ]] || [[ ! -d "$TESTDIR" ]]; then
|
||
|
|
- TESTDIR=$(mktemp -d --tmpdir="/var/tmp" -t dracut-test.XXXXXX)
|
||
|
|
+ TESTDIR=$(mktemp -d -p "/var/tmp" -t dracut-test.XXXXXX)
|
||
|
|
fi
|
||
|
|
echo "TESTDIR=\"$TESTDIR\"" > .testdir
|
||
|
|
export TESTDIR
|