diff options
author | Mike Gilbert <floppym@gentoo.org> | 2016-11-04 14:37:27 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2016-11-04 14:39:54 -0400 |
commit | 9c93a9970c02f14ba821fae6850868f83e75579a (patch) | |
tree | 2b54ba0d469ec3ce19251210ba1766143f168f84 /sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch | |
parent | app-admin/needrestart-2.10: version bump (diff) | |
download | gentoo-9c93a9970c02f14ba821fae6850868f83e75579a.tar.gz gentoo-9c93a9970c02f14ba821fae6850868f83e75579a.tar.bz2 gentoo-9c93a9970c02f14ba821fae6850868f83e75579a.zip |
sys-kernel/dracut: apply a few patches
Bug: https://bugs.gentoo.org/544438#c5
Bug: https://bugs.gentoo.org/586254
Bug: https://github.com/dracutdevs/dracut/pull/169
Package-Manager: portage-2.3.2_p4
Diffstat (limited to 'sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch')
-rw-r--r-- | sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch b/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch new file mode 100644 index 000000000000..fd6f11859457 --- /dev/null +++ b/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch @@ -0,0 +1,32 @@ +From c41df7e1db1adc51399ab2c22f251b15eb2065b1 Mon Sep 17 00:00:00 2001 +From: Alexander Tsoy <alexander@tsoy.me> +Date: Tue, 5 Jan 2016 22:11:57 +0300 +Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev + beginning with "-" + +crypt/parse-crypt.sh generate initqueue job which always call +dev_unit_name() with an argument beginning with "-". This results +in the following error: + +dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087 +dracut-initqueue[307]: systemd-escape: invalid option -- 'c' +--- + modules.d/99base/dracut-lib.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh +index ad03394..0a0b1b9 100755 +--- a/modules.d/99base/dracut-lib.sh ++++ b/modules.d/99base/dracut-lib.sh +@@ -874,7 +874,7 @@ dev_unit_name() + local dev="$1" + + if command -v systemd-escape >/dev/null; then +- systemd-escape -p "$dev" ++ systemd-escape -p -- "$dev" + return + fi + +-- +2.10.2 + |