[patch] git-formatted and signed-off patch

0001-defaults-initrd.scripts-don-t-skip-top-level-devices.patch (text/plain), 1.42 KB, created by Georgy Yakovlev on 2021-09-08 02:05:09 UTC

From 18cbd0c11ce53767655afa01a44f0e8c2a75dbfc Mon Sep 17 00:00:00 2001
From: Georgy Yakovlev <[e-mail]>
Date: Tue, 7 Sep 2021 19:04:16 -0700
Subject: [PATCH] defaults/initrd.scripts: don't skip top level devices with
 partitions

ppc64 media should be mounted as /dev/sdX, not as /dev/sdX1
this loop was skipping /dev/sdX if /dev/sdX1 is present.

Bug: https://bugs.gentoo.org/212794
Bug: https://bugs.gentoo.org/796272
Signed-off-by: Georgy Yakovlev <[e-mail]>
---
 defaults/initrd.scripts | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts
index cdee2a4..7eac892 100644
--- a/defaults/initrd.scripts
+++ b/defaults/initrd.scripts
@@ -178,24 +178,6 @@ findmediamount() {
 			# Check for a block device to mount
 			if [ -b "${x}" ]
 			then
-				skip=0
-				bsn=$(basename "${x}")
-				#
-				# If disk and it has at least one partition, skip.
-				# We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we
-				# don't skip device mapper devices. Even the craziest scenario
-				# deserves a fair chance.
-				#
-				# shellcheck disable=SC2045
-				for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null)
-				do
-					skip=1
-					break;
-				done
-				if [ ${skip} -eq 1 ]
-				then
-					continue
-				fi
 				good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT}
 
 				CDROOT_TYPE=$(determine_fs "${x}" "${CDROOT_TYPE}")
-- 
2.33.0