diff options
| author |   Georgy Yakovlev <gyakovlev@gentoo.org> | 2021-09-07 19:04:16 -0700 |
|---|---|---|
| committer |   Thomas Deutschmann <whissi@gentoo.org> | 2021-09-08 16:00:08 +0200 |
| commit | a3e1af34bb4dce30d99fdeca7b8217f89f219a01 (patch) | |
| tree | dbb79fad5d0392c33143ba5483817303f333bc76 /defaults | |
| parent | genkernel: Bump to v4.2.3 (diff) | |
| download | genkernel-a3e1af34bb4dce30d99fdeca7b8217f89f219a01.tar.gz genkernel-a3e1af34bb4dce30d99fdeca7b8217f89f219a01.tar.bz2 genkernel-a3e1af34bb4dce30d99fdeca7b8217f89f219a01.zip | |
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 <gyakovlev@gentoo.org>
Closes: https://bugs.gentoo.org/796272
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'defaults')
| -rw-r--r-- | defaults/initrd.scripts | 18 |
1 files changed, 0 insertions, 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}") |