From: Topi Miettinen Date: Sun, 1 Mar 2020 08:45:16 +0000 (+0200) Subject: Use TMPDIR if available X-Git-Tag: 051~207 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bc1e69b;p=thirdparty%2Fdracut.git Use TMPDIR if available Use environment variable TMPDIR (typically /run/user/$UID) as default temporary directory, if available. This should be more private location than /var/tmp. Path specified with --tmpdir is takes precedence over TMPDIR and /var/tmp is still used as last resort if neither TMPDIR is set nor --tmpdir is used. Signed-off-by: Topi Miettinen --- diff --git a/dracut.sh b/dracut.sh index c14f6c0bd..ab82cbc97 100755 --- a/dracut.sh +++ b/dracut.sh @@ -140,7 +140,7 @@ Creates initial ramdisk images for preloading modules --confdir [DIR] Specify configuration directory to use *.conf files from. Default: /etc/dracut.conf.d --tmpdir [DIR] Temporary directory to be used instead of default - /var/tmp. + ${TMPDIR:-/var/tmp}. -r, --sysroot [DIR] Specify sysroot directory to collect files from. -l, --local Local mode. Use modules from the current working directory instead of the system-wide installed in @@ -765,6 +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=$dracutsysrootdir/var/tmp [[ $INITRD_COMPRESS ]] && compress=$INITRD_COMPRESS [[ $compress_l ]] && compress=$compress_l