gentoo resync : 21.08.2021

3 files changed, 39 insertions, 1 deletions

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0beb8aacd6cc..8eb146cd6b46 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,11 +1,12 @@
 AUX 053-network-manager.patch 840 BLAKE2B d9dca01ad97015d636dfda3eb2b99a9289dabbc2554ea79159f6e971ab0baa912d21866204d91b4e6cdf9f8f5d953f2ca045aa7979396237e8af053f09e9e173 SHA512 63babf06fc3ad151c2026267cb766817a7902858ddab0cb625551c95a1c83d44b8cafa1bf22ce4e124aa5968b258c6946dadfdd5375f2c532b19173b84623008
 AUX 055-fix-base-do-not-quote-initargs-for-switch_root.patch 1095 BLAKE2B 35e2fbc027db3c6e642939d2139a2ef22b7273d4a11e957fb9e6376b14b8ba26daf39281bb8494251b9940a54cd78b42c357f88bc7469a64307a936b62fc1ca1 SHA512 f59624deb66644e8488e15079d8dbfa1e428bdd325ecd3f879fd1f07869ca7aae001109dabd1816875aeeb5962c05496ce0e2261ee3562fa1800a5e4b61d446a
 AUX 055-fix-crypt-remove-quotes-from-cryptsetupopts.patch 1404 BLAKE2B 4956f8df0b76c204279032fdf545f230f063fd7ea5393e3ade80587e10eb50dfba2e0677da04e641da17d1ce79564b3084274c739b3af59dab2226852b0835b2 SHA512 11243e311aeae6b9f1b6481521a92e4fd962e5fd24b1bd279e04f1f1618ba4ae0c4243d94274dda8e16d0311c377e0fbf2bae5c64c508e29caaf64d123c365a3
+AUX 055-fix-usrmount-do-not-empty-_dev-variable.patch 1358 BLAKE2B 9a0b5e698884eb4e333ff3d519245bbe7bb909247ff999edac7bfce4b37a384f7b6ab7d0a4ffc14d638c46b137430d44d50de41193f46ba799b070bd2031e138 SHA512 1d9d01a6df6c0d9e77e2b0e4ca0881e33abbf3430817416660122960575d428f832a64c6925a2588d56bd042a32a2a68da7cf173f62b4cd23e12ea2e1b49d588
 AUX gentoo-ldconfig-paths-r1.patch 1423 BLAKE2B e8bce9ee4b1b2546d4dbaa22a6167f9e3520df4f5f3b67509e430e4a6dd89d9fd18e53328c4bd6ee817e6b27ffcccf29fbdd922707c98f4fe67f6d44d76de2ff SHA512 fd44643e671d59ca51822d0f68b7ce7756035faca780ec784e64950770944f0aefd00a1dd2424f07568d5d97d46c0080c8e740856e0bff79bcf6a7e14b08ab8f
 AUX gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a
 DIST dracut-053.tar.xz 354668 BLAKE2B d20d0f1675e18cf44615a98255c8b1a73f23e9c665a771a1fe99716d3bf0b6082961ab20fe058bf31c106c4f521d9e8708e2ae98cff00f613197bbf9dd3abda3 SHA512 4736f84442bda208a38d3285ffeb8b845f06e52e3bf60d2aaea121240cf695e1369208c2d2cee1137a6c1d3f8f7794385675006beaf5cd86ade259d5f42d039a
 DIST dracut-055.tar.xz 361752 BLAKE2B 9fcb0bce9ead2e079c70a377ea53701e4634d3dc64ae163e0e157d7d85822a274813e05f6079768640e1807818fad7a8158626413d773686a8d52fcd95fb5680 SHA512 2d2ea2889d9013bc94245bd7d1a2154f24d02bd9c2f7dbb28e5968e17d918e6598c68d85b0f551f968218980a80b19361ca0c9e8e94997ba54f4c09afcd6d866
 EBUILD dracut-053-r1.ebuild 4521 BLAKE2B bfd4df6329b2d0bfc7178dbd7a31194d10a89613aa71bd5233e13638a1f2c6b67d3bc96b9299bd0dd70695749532435640e76097bc51911ad434389636a38202 SHA512 70a9f084a8b163481aeca5a5610c0553c1634de083cf7fd2c5ea014989e32ad624c2f212bd57f5f60c51dd67dbcfec2e749b4b0ed69150b9c5cc4aa828bb74bd
-EBUILD dracut-055-r1.ebuild 4933 BLAKE2B 73b98eee8ed4e730ac123a9bcfd9b5ac64a5599509dd455d9ddbe2bede413227e93105414e5b6239a134131cb31f7e5a349b5baa0e4a773134e55bd6428c87c6 SHA512 ef5570b924ea8c4d92735ff50725357e5da86707aa2776d347ed9eadbe9cb39c5b880d8128fc81d94e37035c5402852105c06474ba689dfe55d560c033386af0
+EBUILD dracut-055-r2.ebuild 4998 BLAKE2B 84aa1f79557fad7d0f92dd5879ea80fbaf3bad86318d421462b344ecd7638c4146195c34bb48221c3ad781ec435bd21ab4a6f6a722867ea1d5bbfd3e314e5afe SHA512 e682f519904d452798ff29a47de30b3c45b1d59c321e799771c16d534ffd46a5342532524b22ae573dd3019bf1911f5218714d2a7abe4431839cc7791f3ae477
 EBUILD dracut-9999.ebuild 4792 BLAKE2B 0a1a700f00c370c7de6db5e90f11d7c93dfedf7cf42838018cd047203333e3f44383446292da3008979c63b13e1622483cb87ae475ad1613b20b4711c1741dd3 SHA512 54b5ca49fe62ff36314ddf0937b9d400bc3891638b06c2dbf82cf946c5808bf2237b9d51406bfbd2b7c162d99cbb402b77155b8260e4cf97bb3f658b03e6d452
 MISC metadata.xml 478 BLAKE2B 28130c92964b57a250220a1f5792459c8c35f5308a9f6713f60cb0492175fb6f296a77535dcb59db47db5cc3e8c3a56e7828e28d3519610a119bac500b844f4f SHA512 75bd848d2f69e892d6d4623fb00d36ac5572f19ce89db246f668c3f15581c1bd74987988c46c6dc656bd1d75342d98a47b7af57e0f646c39572ccb1b398f6090
diff --git a/sys-kernel/dracut/dracut-055-r1.ebuild b/sys-kernel/dracut/dracut-055-r2.ebuild
index e45745cf50f6..5d3767efdfca 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 000000000000..e46f8bb25db9
--- /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
+