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 7FCDF138335 for ; Sun, 21 Jul 2019 16:26:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B2EA2E0843; Sun, 21 Jul 2019 16:26:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 97348E0843 for ; Sun, 21 Jul 2019 16:26:39 +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 7B9853483D6 for ; Sun, 21 Jul 2019 16:26:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B46571A for ; Sun, 21 Jul 2019 16:26:37 +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: <1563724066.cba2892492a1e667b7f8855b9d0cfd60ce557c69.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: cba2892492a1e667b7f8855b9d0cfd60ce557c69 X-VCS-Branch: master Date: Sun, 21 Jul 2019 16:26:37 +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: 1d4f5a8c-1b34-498e-9e25-fba4de64f019 X-Archives-Hash: 72efc6c2430a4d31fae14fd03ae12efb commit: cba2892492a1e667b7f8855b9d0cfd60ce557c69 Author: Thomas Deutschmann gentoo org> AuthorDate: Sat Jul 20 20:37:12 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Jul 21 15:47:46 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=cba28924 initrd.scripts: start_volumes(): Normalize error messages Signed-off-by: Thomas Deutschmann gentoo.org> defaults/initrd.scripts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 61ae534..827f843 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1167,9 +1167,9 @@ start_volumes() { /sbin/mdadm --assemble --scan #Intel Matrix RAID (and possibly others) have a container layer above the actual volumes, #So we have to look for volumes that haven't been activated. - mdadm -IRs + /sbin/mdadm -IRs else - bad_msg "mdadm not found: skipping mdadm raid assembly!" + bad_msg "domdadm invoked but /sbin/mdadm not found; Skipping mdadm raid assembly ..." fi fi @@ -1227,6 +1227,8 @@ start_volumes() { /sbin/dmraid -ay ${DMRAID_OPTS} fi [ -x '/sbin/kpartx' ] && /sbin/dmsetup ls --exec '/sbin/kpartx -a -s' + else + bad_msg "dodmraid invoked but /sbin/dmraid not found; Skipping dmraid activation ..." fi fi @@ -1239,7 +1241,7 @@ start_volumes() { if [ "${lvm_path}" = "MISSING" ] then - bad_msg "dolvm invoked, but LVM binary not available! skipping LVM volume group activation!" + bad_msg "dolvm invoked but LVM binary not available; Skipping LVM volume group activation ..." else for dev in ${RAID_DEVICES} do @@ -1270,7 +1272,7 @@ start_volumes() { then if [ ! -e /sys/fs/bcache/register_quiet ] then - warn_msg "'/sys/fs/bcache/register_quiet' does not exist. Missing kernel driver? Skipping dobcache ..." + bad_msg "dobcache invoked but '/sys/fs/bcache/register_quiet' does not exist; Skipping bcache initialization ..." else local i= for i in $(awk '$4 !~ /^(name$|$)/ { print $4 }' /proc/partitions) @@ -1293,7 +1295,7 @@ start_volumes() { then /sbin/btrfs device scan else - bad_msg "btrfs not found: skipping btrfs device scanning!" + bad_msg "dobtrfs invoked but /sbin/btrfs not found; Skipping btrfs device scanning ..." fi fi