| 1 |
commit: a3e1af34bb4dce30d99fdeca7b8217f89f219a01 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 8 02:04:16 2021 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 8 14:00:08 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a3e1af34 |
| 7 |
|
| 8 |
initrd.scripts: don't skip top level devices with partitions |
| 9 |
|
| 10 |
ppc64 media should be mounted as /dev/sdX, not as /dev/sdX1 |
| 11 |
this loop was skipping /dev/sdX if /dev/sdX1 is present. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/212794 |
| 14 |
Bug: https://bugs.gentoo.org/796272 |
| 15 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 16 |
Closes: https://bugs.gentoo.org/796272 |
| 17 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 18 |
|
| 19 |
defaults/initrd.scripts | 18 ------------------ |
| 20 |
1 file changed, 18 deletions(-) |
| 21 |
|
| 22 |
diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts |
| 23 |
index cdee2a4..7eac892 100644 |
| 24 |
--- a/defaults/initrd.scripts |
| 25 |
+++ b/defaults/initrd.scripts |
| 26 |
@@ -178,24 +178,6 @@ findmediamount() { |
| 27 |
# Check for a block device to mount |
| 28 |
if [ -b "${x}" ] |
| 29 |
then |
| 30 |
- skip=0 |
| 31 |
- bsn=$(basename "${x}") |
| 32 |
- # |
| 33 |
- # If disk and it has at least one partition, skip. |
| 34 |
- # We use /sys/block/${bsn}/${bsn}[0-9]* to make sure that we |
| 35 |
- # don't skip device mapper devices. Even the craziest scenario |
| 36 |
- # deserves a fair chance. |
| 37 |
- # |
| 38 |
- # shellcheck disable=SC2045 |
| 39 |
- for part in $(ls /sys/block/${bsn}/${bsn}*[0-9]* 2>/dev/null) |
| 40 |
- do |
| 41 |
- skip=1 |
| 42 |
- break; |
| 43 |
- done |
| 44 |
- if [ ${skip} -eq 1 ] |
| 45 |
- then |
| 46 |
- continue |
| 47 |
- fi |
| 48 |
good_msg "Attempting to mount media: ${x}" ${CRYPT_SILENT} |
| 49 |
|
| 50 |
CDROOT_TYPE=$(determine_fs "${x}" "${CDROOT_TYPE}") |
Archives