From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 64FDA158041 for ; Wed, 8 Sep 2021 14:00:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BBEA7E0940; Wed, 8 Sep 2021 14:00:31 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A4D7DE0940 for ; Wed, 8 Sep 2021 14:00:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2094335CDE for ; Wed, 8 Sep 2021 14:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5000D79 for ; Wed, 8 Sep 2021 14:00:28 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1631109608.a3e1af34bb4dce30d99fdeca7b8217f89f219a01.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: a3e1af34bb4dce30d99fdeca7b8217f89f219a01 X-VCS-Branch: master Date: Wed, 8 Sep 2021 14:00:28 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1df05917-e16f-41e3-8d9e-a5cb6a606bed X-Archives-Hash: 700e43b4a09e013000a700a4360f2689 commit: a3e1af34bb4dce30d99fdeca7b8217f89f219a01 Author: Georgy Yakovlev gentoo org> AuthorDate: Wed Sep 8 02:04:16 2021 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Wed Sep 8 14:00:08 2021 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=a3e1af34 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 gentoo.org> Closes: https://bugs.gentoo.org/796272 Signed-off-by: Thomas Deutschmann gentoo.org> 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}")