From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/
Date: Tue, 17 Aug 2021 17:24:33 +0000 (UTC) [thread overview]
Message-ID: <1629221021.85685d7b73395bddcf58a7550a0220ee9175e3f2.floppym@gentoo> (raw)
commit: 85685d7b73395bddcf58a7550a0220ee9175e3f2
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Tue Aug 17 10:51:21 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Aug 17 17:23:41 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85685d7b
sys-kernel/dracut: fix usr mount regression
Closes: https://bugs.gentoo.org/807971
Signed-off-by: Alexander Tsoy <alexander <AT> tsoy.me>
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/22009
.../{dracut-055-r1.ebuild => dracut-055-r2.ebuild} | 1 +
...5-fix-usrmount-do-not-empty-_dev-variable.patch | 36 ++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/sys-kernel/dracut/dracut-055-r1.ebuild b/sys-kernel/dracut/dracut-055-r2.ebuild
similarity index 98%
rename from sys-kernel/dracut/dracut-055-r1.ebuild
rename to sys-kernel/dracut/dracut-055-r2.ebuild
index e45745cf50f..5d3767efdfc 100644
--- a/sys-kernel/dracut/dracut-055-r1.ebuild
+++ b/sys-kernel/dracut/dracut-055-r2.ebuild
@@ -62,6 +62,7 @@ QA_MULTILIB_PATHS="usr/lib/dracut/.*"
PATCHES=(
"${FILESDIR}"/055-fix-crypt-remove-quotes-from-cryptsetupopts.patch
"${FILESDIR}"/055-fix-base-do-not-quote-initargs-for-switch_root.patch
+ "${FILESDIR}"/055-fix-usrmount-do-not-empty-_dev-variable.patch
"${FILESDIR}"/gentoo-ldconfig-paths-r1.patch
)
diff --git a/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
new file mode 100644
index 00000000000..e46f8bb25db
--- /dev/null
+++ b/sys-kernel/dracut/files/055-fix-usrmount-do-not-empty-_dev-variable.patch
@@ -0,0 +1,36 @@
+From 4afdcba212793f136aea012b30dd7bdb5b641a5a Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 16 Aug 2021 18:54:34 +0300
+Subject: [PATCH] fix(usrmount): do not empty _dev variable
+
+Currently $_dev is always overridden with the value returned by
+label_uuid_to_dev(). This results in an empty value if $_dev is a
+device path. Fix this by calling label_uuid_to_dev() conditionally.
+
+Bug: https://bugs.gentoo.org/807971
+Fixes: d3532978de04c78f53664dad7b37705a49a7ee54
+---
+ modules.d/98usrmount/mount-usr.sh | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
+index 23ed06aa..c8e1893b 100755
+--- a/modules.d/98usrmount/mount-usr.sh
++++ b/modules.d/98usrmount/mount-usr.sh
+@@ -55,7 +55,12 @@ mount_usr() {
+ while read -r _dev _mp _fs _opts _freq _passno || [ -n "$_dev" ]; do
+ [ "${_dev%%#*}" != "$_dev" ] && continue
+ if [ "$_mp" = "/usr" ]; then
+- _dev="$(label_uuid_to_dev "$_dev")"
++ case "$_dev" in
++ LABEL=* | UUID=* | PARTUUID=* | PARTLABEL=*)
++ _dev="$(label_uuid_to_dev "$_dev")"
++ ;;
++ *) ;;
++ esac
+
+ if strstr "$_opts" "subvol=" \
+ && [ "${root#block:}" -ef "$_dev" ] \
+--
+2.31.1
+
next reply other threads:[~2021-08-17 17:24 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-17 17:24 Mike Gilbert [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-02-03 17:40 [gentoo-commits] repo/gentoo:master commit in: sys-kernel/dracut/files/, sys-kernel/dracut/ Nowa Ammerlaan
2024-11-10 2:21 Mike Gilbert
2024-11-01 17:10 Andrew Ammerlaan
2024-09-30 9:09 Andrew Ammerlaan
2023-12-13 9:19 Andrew Ammerlaan
2023-09-22 6:10 Andrew Ammerlaan
2023-07-20 3:39 Sam James
2023-05-26 20:03 Mike Gilbert
2022-12-25 2:53 Mike Gilbert
2021-12-27 16:51 Mike Gilbert
2021-09-06 0:14 Mike Gilbert
2021-07-23 19:16 Mike Gilbert
2021-06-14 18:42 Mike Gilbert
2020-07-03 11:18 Thomas Deutschmann
2020-03-10 19:50 Mike Gilbert
2019-12-29 19:39 Mike Gilbert
2019-01-21 14:23 Mike Gilbert
2018-03-24 18:03 Mike Gilbert
2017-02-09 18:47 Patrick McLean
2017-02-09 18:47 Patrick McLean
2016-11-04 18:39 Mike Gilbert
2015-08-16 10:04 Amadeusz Żołnowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1629221021.85685d7b73395bddcf58a7550a0220ee9175e3f2.floppym@gentoo \
--to=floppym@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox