Harald Hoyer eb69ae
From 97a931c7d9f8190115893a932f2e10292704cae4 Mon Sep 17 00:00:00 2001
Harald Hoyer eb69ae
From: Dusty Mabe <dusty@dustymabe.com>
Harald Hoyer eb69ae
Date: Fri, 13 Mar 2020 15:40:11 -0400
Harald Hoyer eb69ae
Subject: [PATCH] don't prefer $TMPDIR over --tmpdir
Harald Hoyer eb69ae
Harald Hoyer eb69ae
Ability to use `$TMPDIR` was introduced in bc1e69b but
Harald Hoyer eb69ae
causes the `--tmpdir` option on the command line to be
Harald Hoyer eb69ae
ignored. Switch to only using `$TMPDIR` if `--tmpdir`
Harald Hoyer eb69ae
wasn't specified.
Harald Hoyer eb69ae
---
Harald Hoyer eb69ae
 dracut.sh | 2 +-
Harald Hoyer eb69ae
 1 file changed, 1 insertion(+), 1 deletion(-)
Harald Hoyer eb69ae
Harald Hoyer eb69ae
diff --git a/dracut.sh b/dracut.sh
Harald Hoyer eb69ae
index ab82cbc9..39fa3692 100755
Harald Hoyer eb69ae
--- a/dracut.sh
Harald Hoyer eb69ae
+++ b/dracut.sh
Harald Hoyer eb69ae
@@ -765,7 +765,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
Harald Hoyer eb69ae
 [[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
Harald Hoyer eb69ae
 [[ $fw_dir ]] || fw_dir="$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware:$dracutsysrootdir/lib/firmware/$kernel"
Harald Hoyer eb69ae
 [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
Harald Hoyer eb69ae
-[[ $tmpdir ]] && tmpdir="$TMPDIR"
Harald Hoyer eb69ae
+[[ $tmpdir ]] || tmpdir="$TMPDIR"
Harald Hoyer eb69ae
 [[ $tmpdir ]] || tmpdir=$dracutsysrootdir/var/tmp
Harald Hoyer eb69ae
 [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
Harald Hoyer eb69ae
 [[ $compress_l ]] && compress=$compress_l
Harald Hoyer 308914