From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1053895-garchives=archives.gentoo.org@lists.gentoo.org>
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 02511138334
for <garchives@archives.gentoo.org>; Tue, 23 Oct 2018 22:00:25 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BD359E0936;
Tue, 23 Oct 2018 22:00:23 +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 8DCD1E0936
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2018 22:00:23 +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 AE6A1335CDE
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2018 22:00:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 6D094449
for <gentoo-commits@lists.gentoo.org>; Tue, 23 Oct 2018 22:00:19 +0000 (UTC)
From: "William Hubbs" <williamh@gentoo.org>
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" <williamh@gentoo.org>
Message-ID: <1540331257.d70b1c55b67b44b98c23ceed25bc428481f7e00a.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: d70b1c55b67b44b98c23ceed25bc428481f7e00a
X-VCS-Branch: master
Date: Tue, 23 Oct 2018 22:00:19 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 0f9694cc-b0df-4578-87f3-2ca30fec36bd
X-Archives-Hash: 457111c9bcd518167253933de0c8a66e
commit: d70b1c55b67b44b98c23ceed25bc428481f7e00a
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Oct 23 21:47:37 2018 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 21:47:37 2018 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=d70b1c55
modules: Add --first-time switch to modprobe commands
On Linux, kernel modules should be loaded once during boot, either in an
initramfs or by this service.
This does not change anything other than printing out messages if a
module is loaded more than once.
X-Gentoo-Bug: 659530
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=659530
init.d/modules.in | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/init.d/modules.in b/init.d/modules.in
index 998972ba..abaab85b 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -56,11 +56,12 @@ load_modules()
ebegin "Loading module $x"
case "$RC_UNAME" in
FreeBSD) kldload "$x"; rc=$? ;;
- Linux) modprobe --use-blacklist -q "$x"; rc=$? ;;
+ Linux) modprobe --first-time -q --use-blacklist "$x"; rc=$? ;;
*) ;;
esac
eend $rc "Failed to load $x"
done
+ return 0
}
modules_load_d()
@@ -118,7 +119,7 @@ Linux_modules()
[ -n "${args}" ] && break
done
[ -z "$args" ] && eval args=\$module_${xx}_args
- eval modprobe --use-blacklist --verbose "$x" "$args"
+ eval modprobe --first-time --use-blacklist --verbose "$x" "$args"
done
[ -n "$list" ] && eend
}