dracut-050-26.git20200316

- fixed `--tmpdir` mishandling
This commit is contained in:
Harald Hoyer 2020-03-16 16:09:13 +01:00
parent 5f0dd725fe
commit eb69ae88ed
3 changed files with 32 additions and 1 deletions

View File

@ -21,3 +21,4 @@ index 5190f220..3bb479e4 100755
-initrd $TESTDIR/initramfs.testing -initrd $TESTDIR/initramfs.testing
if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then if ! grep -F -m 1 -q dracut-root-block-success $TESTDIR/result; then

26
0025.patch Normal file
View File

@ -0,0 +1,26 @@
From 97a931c7d9f8190115893a932f2e10292704cae4 Mon Sep 17 00:00:00 2001
From: Dusty Mabe <dusty@dustymabe.com>
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

View File

@ -5,7 +5,7 @@
# strip the automatically generated dep here and instead co-own the # strip the automatically generated dep here and instead co-own the
# directory. # directory.
%global __requires_exclude pkg-config %global __requires_exclude pkg-config
%define dist_free_release 25.git20200313 %define dist_free_release 26.git20200316
Name: dracut Name: dracut
Version: 050 Version: 050
@ -52,6 +52,7 @@ Patch21: 0021.patch
Patch22: 0022.patch Patch22: 0022.patch
Patch23: 0023.patch Patch23: 0023.patch
Patch24: 0024.patch Patch24: 0024.patch
Patch25: 0025.patch
Source1: https://www.gnu.org/licenses/lgpl-2.1.txt 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 %endif
%changelog %changelog
* Mon Mar 16 2020 Harald Hoyer <harald@redhat.com> - 050-26.git20200316
- fixed `--tmpdir` mishandling
* Fri Mar 13 2020 Harald Hoyer <harald@redhat.com> - 050-25.git20200313 * Fri Mar 13 2020 Harald Hoyer <harald@redhat.com> - 050-25.git20200313
- network-manager: ensure that nm-run.sh is executed for rd.neednet - network-manager: ensure that nm-run.sh is executed for rd.neednet