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 48E38139085 for ; Sun, 18 Dec 2016 17:22:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 013EC21C039; Sun, 18 Dec 2016 17:22:52 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C99FA21C039 for ; Sun, 18 Dec 2016 17:22:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 61FEF341700 for ; Sun, 18 Dec 2016 17:22:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F40424DC for ; Sun, 18 Dec 2016 17:22:48 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1482024073.abe552b969b6601f47ba0474f683d8cd80d53c9d.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/modules.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: abe552b969b6601f47ba0474f683d8cd80d53c9d X-VCS-Branch: master Date: Sun, 18 Dec 2016 17:22:48 +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-Archives-Salt: 199cbf8f-362f-4576-aae2-cc609acf12bd X-Archives-Hash: d07ced715e42ac00251e9ab19416d18f commit: abe552b969b6601f47ba0474f683d8cd80d53c9d Author: William Hubbs gmail com> AuthorDate: Sun Dec 18 01:13:48 2016 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Dec 18 01:21:13 2016 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=abe552b9 modules: get rid of printing each module on Linux Now that we respect the module blacklists, don't print every module we try to load, because it might not end up loaded due to the blacklist, and modprobe doesn't consider that a failure. init.d/modules.in | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/init.d/modules.in b/init.d/modules.in index 3431c4a..2eab77f 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -31,7 +31,7 @@ FreeBSD_modules() Linux_modules() { - # Should not fail if kernel do not have module + # Should not fail if kernel does not have module # support compiled in ... [ ! -f /proc/modules ] && return 0 @@ -48,22 +48,21 @@ Linux_modules() x=${x%.*} done - local list= x= xx= y= args= mpargs= cnt=0 a= + local list= x= xx= y= args= mpargs= a= for x in $kv_variant_list ; do eval list=\$modules_$(shell_var "$x") [ -n "$list" ] && break done [ -z "$list" ] && list=$modules + [ -n "$list" ] && ebegin "Loading kernel modules" for x in $list; do a=${x#*:} if [ "$a" = "$x" ]; then unset mpargs - ebegin "Loading module $x" else x=${x%%:*} mpargs="-o $a" - ebegin "Loading module $x as $a" fi aa=$(shell_var "$a") xx=$(shell_var "$x") @@ -75,10 +74,9 @@ Linux_modules() done [ -z "$args" ] && eval args=\$module_${aa}_args [ -z "$args" ] && eval args=\$module_${xx}_args - eval modprobe --use-blacklist -q "$mpargs" "$x" "$args" - eend $? "Failed to load $x" && : $(( cnt += 1 )) + eval modprobe --use-blacklist --verbose "$mpargs" "$x" "$args" done - einfo "Autoloaded $cnt module(s)" + [ -n "$list" ] && eend } start()