From eb69ae88ede0a8bbf6ac0be224c0746ffc84991e Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Mon, 16 Mar 2020 16:09:13 +0100 Subject: [PATCH] dracut-050-26.git20200316 - fixed `--tmpdir` mishandling --- 0024.patch | 1 + 0025.patch | 26 ++++++++++++++++++++++++++ dracut.spec | 6 +++++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 0025.patch diff --git a/0024.patch b/0024.patch index 7aaed97..ec3094d 100644 --- a/0024.patch +++ b/0024.patch @@ -21,3 +21,4 @@ index 5190f220..3bb479e4 100755 -initrd $TESTDIR/initramfs.testing if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then + diff --git a/0025.patch b/0025.patch new file mode 100644 index 0000000..a221b3e --- /dev/null +++ b/0025.patch @@ -0,0 +1,26 @@ +From 97a931c7d9f8190115893a932f2e10292704cae4 Mon Sep 17 00:00:00 2001 +From: Dusty Mabe +Date: Fri, 13 Mar 2020 15:40:11 -0400 +Subject: [PATCH] don't prefer $TMPDIR over --tmpdir + +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 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dracut.sh b/dracut.sh +index ab82cbc9..39fa3692 100755 +--- 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 diff --git a/dracut.spec b/dracut.spec index c5f90db..e35f1e5 100644 --- a/dracut.spec +++ b/dracut.spec @@ -5,7 +5,7 @@ # strip the automatically generated dep here and instead co-own the # directory. %global __requires_exclude pkg-config -%define dist_free_release 25.git20200313 +%define dist_free_release 26.git20200316 Name: dracut Version: 050 @@ -52,6 +52,7 @@ Patch21: 0021.patch Patch22: 0022.patch Patch23: 0023.patch Patch24: 0024.patch +Patch25: 0025.patch Source1: https://www.gnu.org/licenses/lgpl-2.1.txt @@ -506,6 +507,9 @@ install -m 0755 51-dracut-rescue-postinst.sh $RPM_BUILD_ROOT%{_sysconfdir}/kerne %endif %changelog +* Mon Mar 16 2020 Harald Hoyer - 050-26.git20200316 +- fixed `--tmpdir` mishandling + * Fri Mar 13 2020 Harald Hoyer - 050-25.git20200313 - network-manager: ensure that nm-run.sh is executed for rd.neednet