5f0dd725fe
network-manager: ensure that nm-run.sh is executed for rd.neednet
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
From bc1e69b691e6d25722b64e1df58a35e3be977801 Mon Sep 17 00:00:00 2001
|
|
From: Topi Miettinen <toiwoton@gmail.com>
|
|
Date: Sun, 1 Mar 2020 10:45:16 +0200
|
|
Subject: [PATCH] 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 <toiwoton@gmail.com>
|
|
---
|
|
dracut.sh | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dracut.sh b/dracut.sh
|
|
index c14f6c0b..ab82cbc9 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
|
|
|