From: "William Hubbs" <williamh@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/openrc:master commit in: init.d/
Date: Thu, 25 Aug 2016 17:12:22 +0000 (UTC) [thread overview]
Message-ID: <1472144924.556dbff99d53cdcc00e6b1ec67e1679f72b6f284.williamh@OpenRC> (raw)
commit: 556dbff99d53cdcc00e6b1ec67e1679f72b6f284
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Aug 23 22:48:39 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 17:08:44 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=556dbff9
Add modules-load.d support
init.d/Makefile | 4 +--
init.d/modules-load.in | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++
init.d/modules.in | 1 +
3 files changed, 76 insertions(+), 2 deletions(-)
diff --git a/init.d/Makefile b/init.d/Makefile
index a1d2ec7..8eb62e4 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -20,10 +20,10 @@ SRCS-FreeBSD= hostid.in modules.in moused.in newsyslog.in pf.in rarpd.in \
rc-enabled.in rpcbind.in savecore.in syslogd.in
# These are FreeBSD specific
SRCS-FreeBSD+= adjkerntz.in devd.in dumpon.in encswap.in ipfw.in \
- mixer.in nscd.in powerd.in syscons.in
+ modules.in modules-load.in mixer.in nscd.in powerd.in syscons.in
SRCS-Linux= binfmt.in devfs.in dmesg.in hwclock.in consolefont.in keymaps.in \
- killprocs.in modules.in mount-ro.in mtab.in numlock.in \
+ killprocs.in modules.in modules-load.in mount-ro.in mtab.in numlock.in \
procfs.in net-online.in sysfs.in termencoding.in tmpfiles.dev.in
# Generic BSD scripts
diff --git a/init.d/modules-load.in b/init.d/modules-load.in
new file mode 100644
index 0000000..8c19a36
--- /dev/null
+++ b/init.d/modules-load.in
@@ -0,0 +1,73 @@
+#!@SBINDIR@/openrc-run
+# Copyright (c) 2016 The OpenRC Authors.
+# See the Authors file at the top-level directory of this distribution and
+# https://github.com/OpenRC/openrc/blob/master/AUTHORS
+#
+# This file is part of OpenRC. It is subject to the license terms in
+# the LICENSE file found in the top-level directory of this
+# distribution and at https://github.com/OpenRC/openrc/blob/master/LICENSE
+# This file may not be copied, modified, propagated, or distributed
+# except according to the terms contained in the LICENSE file.
+
+description="Loads a list of modules from systemd-compatible locations."
+
+depend()
+{
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
+}
+
+modules_dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+
+find_modfiles()
+{
+ local basenames files x y
+ for x in $modules_dirs; do
+ [ ! -d $x ] && continue
+ for y in $x/*.conf; do
+ [ -f $y ] && basenames="${basenames}\n${y##*/}"
+ done
+ done
+ basenames=$(printf "$basenames" | sort -u)
+ for x in $basenames; do
+ for y in $modules_dirs; do
+ [ -r $y/$x ] &&
+ path=$y/$x
+ done
+ files="$files $path"
+ done
+ echo $files
+}
+
+load_modules()
+{
+ local file m modules rc x
+ file=$1
+ [ -z "$file" ] && return 0
+ while read m x; do
+ case $m in
+ \;) continue ;;
+ \#) continue ;;
+ *) modules="$modules $m"
+ ;;
+ esac
+ done < $file
+ for x in $modules; do
+ ebegin "Loading module $x"
+ case "$RC_UNAME" in
+ FreeBSD) kldload "$x"; rc=$? ;;
+ linux) modprobe -q "$x"; rc=$? ;;
+ *) ;;
+ esac
+ eend $rc "Failed to load $x"
+ done
+}
+
+start()
+{
+ local x
+ files=$(find_modfiles)
+ for x in $files; do
+ load_modules $x
+ done
+ return 0
+}
diff --git a/init.d/modules.in b/init.d/modules.in
index 5bfae6d..2568f73 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,6 +14,7 @@ description="Loads a user defined list of kernel modules."
depend()
{
use isapnp
+ want modules-load
keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
next reply other threads:[~2016-08-25 17:12 UTC|newest]
Thread overview: 286+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-25 17:12 William Hubbs [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-10-23 22:00 [gentoo-commits] proj/openrc:master commit in: init.d/ William Hubbs
2018-05-11 18:19 William Hubbs
2018-03-16 18:54 William Hubbs
2018-03-15 1:43 William Hubbs
2018-03-12 2:43 William Hubbs
2018-02-27 21:57 William Hubbs
2018-02-23 21:38 William Hubbs
2018-01-05 20:59 William Hubbs
2017-12-14 23:32 William Hubbs
2017-12-14 23:11 William Hubbs
2017-12-14 22:39 William Hubbs
2017-12-14 20:19 William Hubbs
2017-12-14 18:53 William Hubbs
2017-12-14 18:53 William Hubbs
2017-12-12 22:59 William Hubbs
2017-12-12 20:24 William Hubbs
2017-12-12 18:57 William Hubbs
2017-12-11 23:46 William Hubbs
2017-12-11 20:57 William Hubbs
2017-11-14 19:22 William Hubbs
2017-10-10 15:57 William Hubbs
2017-10-09 22:32 William Hubbs
2017-09-18 18:07 William Hubbs
2017-06-12 15:45 William Hubbs
2017-06-12 15:45 William Hubbs
2017-06-05 17:18 William Hubbs
2017-04-10 15:29 William Hubbs
2017-04-06 15:49 William Hubbs
2017-03-31 22:36 William Hubbs
2017-03-31 18:42 William Hubbs
2017-03-28 22:53 William Hubbs
2017-03-16 15:26 William Hubbs
2017-03-15 22:31 William Hubbs
2017-03-12 18:56 William Hubbs
2017-03-08 16:46 William Hubbs
2017-03-07 23:54 William Hubbs
2017-02-28 23:44 William Hubbs
2017-02-28 23:44 William Hubbs
2016-12-21 18:10 William Hubbs
2016-12-18 17:22 William Hubbs
2016-12-17 22:57 William Hubbs
2016-12-17 22:57 William Hubbs
2016-11-03 17:48 William Hubbs
2016-11-03 17:36 William Hubbs
2016-11-03 16:20 William Hubbs
2016-10-06 3:49 William Hubbs
2016-10-04 23:23 William Hubbs
2016-10-04 17:08 William Hubbs
2016-10-04 16:58 William Hubbs
2016-09-28 19:21 William Hubbs
2016-09-23 19:24 William Hubbs
2016-09-20 18:17 William Hubbs
2016-09-12 17:59 William Hubbs
2016-09-12 17:58 William Hubbs
2016-09-08 18:37 William Hubbs
2016-09-08 16:54 William Hubbs
2016-09-08 15:41 William Hubbs
2016-09-01 22:12 William Hubbs
2016-08-30 14:16 William Hubbs
2016-08-25 22:04 William Hubbs
2016-08-25 21:22 William Hubbs
2016-08-24 18:49 William Hubbs
2016-08-24 18:49 William Hubbs
2016-08-19 16:09 William Hubbs
2016-08-15 18:48 William Hubbs
2016-08-15 18:48 William Hubbs
2016-07-27 19:09 William Hubbs
2016-07-26 16:15 William Hubbs
2016-07-19 22:34 William Hubbs
2016-07-06 17:24 William Hubbs
2016-05-05 22:17 William Hubbs
2016-04-26 20:00 William Hubbs
2016-04-15 16:40 William Hubbs
2016-02-09 21:42 William Hubbs
2016-02-06 1:03 Mike Frysinger
2016-01-28 23:20 William Hubbs
2016-01-01 15:20 William Hubbs
2015-12-11 19:56 William Hubbs
2015-10-29 16:36 William Hubbs
2015-10-14 22:49 William Hubbs
2015-10-13 22:45 William Hubbs
2015-10-08 18:20 William Hubbs
2015-10-08 17:51 William Hubbs
2015-10-07 16:39 William Hubbs
2015-10-06 18:33 William Hubbs
2015-10-05 16:24 William Hubbs
2015-10-05 16:11 William Hubbs
2015-09-07 13:31 William Hubbs
2015-08-21 17:23 William Hubbs
2015-08-10 23:51 William Hubbs
2015-08-10 23:51 William Hubbs
2015-08-10 3:17 Mike Frysinger
2015-07-10 18:26 William Hubbs
2015-06-02 18:14 William Hubbs
2015-05-01 14:21 William Hubbs
2015-04-25 22:36 William Hubbs
2015-04-22 0:00 William Hubbs
2015-04-22 0:00 William Hubbs
2015-04-20 16:39 William Hubbs
2015-04-20 16:39 William Hubbs
2015-04-19 19:33 William Hubbs
2015-04-17 19:18 William Hubbs
2015-04-14 16:45 William Hubbs
2015-04-08 14:44 William Hubbs
2015-04-07 23:00 William Hubbs
2015-03-23 19:11 William Hubbs
2015-03-20 23:46 William Hubbs
2015-02-27 16:21 William Hubbs
2015-02-27 2:30 Robin H. Johnson
2015-02-18 16:06 William Hubbs
2015-02-03 16:56 William Hubbs
2015-01-24 19:41 William Hubbs
2015-01-18 15:30 William Hubbs
2014-11-24 3:54 William Hubbs
2014-11-20 17:26 William Hubbs
2014-11-20 17:02 William Hubbs
2014-11-06 20:38 William Hubbs
2014-10-27 23:15 William Hubbs
2014-10-18 18:54 William Hubbs
2014-10-06 21:25 William Hubbs
2014-10-06 20:35 William Hubbs
2014-09-16 22:45 William Hubbs
2014-09-16 20:19 William Hubbs
2014-08-29 14:12 William Hubbs
2014-08-22 19:10 William Hubbs
2014-08-22 19:10 William Hubbs
2014-08-10 22:16 ` William Hubbs
2014-08-22 19:10 William Hubbs
2014-08-09 17:42 ` William Hubbs
2014-07-24 23:29 William Hubbs
2014-08-22 19:10 ` William Hubbs
2014-07-16 23:23 William Hubbs
2014-07-16 23:23 William Hubbs
2014-07-16 18:14 William Hubbs
2014-07-14 20:59 William Hubbs
2014-07-09 20:39 William Hubbs
2014-07-09 20:39 William Hubbs
2014-07-04 14:11 William Hubbs
2014-07-01 1:33 William Hubbs
2014-06-20 23:42 William Hubbs
2014-04-03 18:05 William Hubbs
2014-01-23 18:04 William Hubbs
2014-01-23 6:21 Mike Frysinger
2014-01-18 7:56 William Hubbs
2013-12-08 18:49 William Hubbs
2013-12-06 19:27 William Hubbs
2013-10-28 20:32 William Hubbs
2013-10-28 20:32 William Hubbs
2013-10-18 21:54 William Hubbs
2013-10-18 20:01 William Hubbs
2013-10-08 15:46 William Hubbs
2013-10-04 20:24 William Hubbs
2013-09-01 21:32 William Hubbs
2013-08-13 17:22 William Hubbs
2013-07-31 17:53 William Hubbs
2013-07-26 17:23 William Hubbs
2013-06-24 20:46 William Hubbs
2013-06-24 19:32 Robin H. Johnson
2013-06-24 21:31 ` Robin H. Johnson
2013-04-27 15:36 William Hubbs
2013-03-22 19:56 William Hubbs
2013-03-08 21:33 William Hubbs
2013-03-06 18:51 William Hubbs
2013-02-17 2:49 William Hubbs
2013-02-16 8:12 William Hubbs
2013-02-15 22:17 William Hubbs
2013-02-14 23:54 William Hubbs
2013-02-09 23:46 William Hubbs
2013-02-01 19:51 William Hubbs
2013-02-01 19:51 William Hubbs
2012-12-21 20:31 William Hubbs
2012-12-20 22:05 William Hubbs
2012-12-18 5:24 Mike Frysinger
2012-12-18 5:24 Mike Frysinger
2012-12-18 5:23 Mike Frysinger
2012-12-18 5:23 Mike Frysinger
2012-12-17 2:06 William Hubbs
2012-11-30 18:05 William Hubbs
2012-11-29 16:38 William Hubbs
2012-11-07 1:45 Robin H. Johnson
2012-11-06 23:19 Robin H. Johnson
2012-11-06 23:03 Robin H. Johnson
2012-11-06 23:02 Robin H. Johnson
2012-11-06 22:53 Robin H. Johnson
2012-10-22 14:43 William Hubbs
2012-10-20 2:47 William Hubbs
2012-10-20 2:02 William Hubbs
2012-10-19 18:05 William Hubbs
2012-10-17 14:33 William Hubbs
2012-10-16 19:34 William Hubbs
2012-10-16 19:00 Christian Ruppert
2012-10-02 21:01 William Hubbs
2012-10-02 16:11 William Hubbs
2012-09-26 21:33 Robin H. Johnson
2012-09-26 16:59 William Hubbs
2012-09-15 21:22 William Hubbs
2012-09-10 20:48 William Hubbs
2012-09-10 1:43 William Hubbs
2012-09-08 0:28 William Hubbs
2012-08-26 1:32 William Hubbs
2012-08-24 15:36 William Hubbs
2012-08-18 20:37 Christian Ruppert
2012-08-17 18:34 William Hubbs
2012-07-15 19:13 William Hubbs
2012-07-15 19:03 William Hubbs
2012-07-15 19:03 William Hubbs
2012-07-15 19:03 William Hubbs
2012-05-27 15:15 William Hubbs
2012-05-14 0:06 William Hubbs
2012-05-02 19:43 William Hubbs
2012-04-16 18:50 William Hubbs
2012-03-29 17:59 William Hubbs
2012-03-26 19:53 William Hubbs
2012-03-25 23:41 William Hubbs
2012-03-24 20:01 William Hubbs
2012-03-24 19:38 William Hubbs
2012-03-24 18:34 William Hubbs
2012-02-21 1:04 William Hubbs
2012-02-20 17:55 William Hubbs
2012-02-20 17:49 William Hubbs
2012-02-18 23:29 William Hubbs
2012-02-18 19:56 William Hubbs
2012-02-17 17:30 William Hubbs
2012-02-16 20:09 William Hubbs
2012-02-13 18:28 William Hubbs
2012-02-13 16:19 William Hubbs
2012-02-12 18:44 William Hubbs
2012-02-10 16:24 William Hubbs
2012-02-10 15:28 William Hubbs
2012-02-09 7:29 Robin H. Johnson
2012-01-30 18:14 William Hubbs
2012-01-27 17:27 William Hubbs
2012-01-26 17:18 William Hubbs
2012-01-26 6:11 Mike Frysinger
2012-01-24 4:07 William Hubbs
2012-01-24 3:49 William Hubbs
2012-01-07 19:43 William Hubbs
2012-01-06 4:36 William Hubbs
2012-01-05 12:59 William Hubbs
2011-12-30 16:50 William Hubbs
2011-12-29 23:34 William Hubbs
2011-12-29 16:02 William Hubbs
2011-12-28 0:00 William Hubbs
2011-12-20 7:49 William Hubbs
2011-12-18 19:40 William Hubbs
2011-12-13 3:19 William Hubbs
2011-11-28 5:46 William Hubbs
2011-11-27 3:00 William Hubbs
2011-11-26 8:22 Mike Frysinger
2011-11-23 18:18 Mike Frysinger
2011-10-26 15:39 William Hubbs
2011-10-02 17:21 William Hubbs
2011-09-20 22:27 Christian Ruppert
2011-09-18 20:07 Mike Frysinger
2011-09-18 20:07 Mike Frysinger
2011-09-18 20:07 Mike Frysinger
2011-09-11 16:52 Christian Ruppert
2011-09-02 7:00 William Hubbs
2011-08-20 19:14 William Hubbs
2011-08-20 17:48 William Hubbs
2011-07-28 14:31 William Hubbs
2011-07-26 5:45 William Hubbs
2011-07-23 21:54 William Hubbs
2011-07-14 17:19 William Hubbs
2011-07-07 19:51 William Hubbs
2011-06-24 17:27 William Hubbs
2011-06-18 15:09 William Hubbs
2011-06-02 16:35 William Hubbs
2011-04-21 18:06 William Hubbs
2011-04-18 22:39 William Hubbs
2011-04-17 13:19 Anthony G. Basile
2011-04-14 20:25 William Hubbs
2011-04-11 20:42 William Hubbs
2011-04-10 22:27 William Hubbs
2011-04-08 19:10 William Hubbs
2011-04-07 12:21 William Hubbs
2011-03-25 16:33 William Hubbs
2011-03-24 3:44 William Hubbs
2011-03-22 4:57 William Hubbs
2011-03-06 17:58 William Hubbs
2011-02-14 23:56 Anthony G. Basile
2011-02-14 17:07 Mike Frysinger
2011-02-14 17:07 Mike Frysinger
2011-02-14 9:41 Anthony G. Basile
2011-02-10 5:18 William Hubbs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472144924.556dbff99d53cdcc00e6b1ec67e1679f72b6f284.williamh@OpenRC \
--to=williamh@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox