]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
don't prefer $TMPDIR over --tmpdir
authorDusty Mabe <dusty@dustymabe.com>
Fri, 13 Mar 2020 19:40:11 +0000 (15:40 -0400)
committerHarald Hoyer <harald@hoyer.xyz>
Mon, 16 Mar 2020 13:45:01 +0000 (14:45 +0100)
Ability to use `$TMPDIR` was introduced in bc1e69b but
causes the `--tmpdir` option on the command line to be
ignored. Switch to only using `$TMPDIR` if `--tmpdir`
wasn't specified.

dracut.sh

index ab82cbc97d35048f0e6112c10058d4648c63cdbf..39fa3692fef29a7503bc4892bf4f13fb94f0ead0 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -765,7 +765,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
 [[ $dracutbasedir ]] || dracutbasedir=$dracutsysrootdir/usr/lib/dracut
 [[ $fw_dir ]] || fw_dir="$dracutsysrootdir/lib/firmware/updates:$dracutsysrootdir/lib/firmware:$dracutsysrootdir/lib/firmware/$kernel"
 [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
-[[ $tmpdir ]] && tmpdir="$TMPDIR"
+[[ $tmpdir ]] || tmpdir="$TMPDIR"
 [[ $tmpdir ]] || tmpdir=$dracutsysrootdir/var/tmp
 [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS
 [[ $compress_l ]] && compress=$compress_l