* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-07-06 17:35 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-07-06 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 6074cbd651da7f27fc6fbc20a66f651c2577857b
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Jul 6 15:40:31 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Jul 6 17:22:49 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=6074cbd6
hwclock: always use --noadjfile if available
When we use the --utc or --localtime switch, also use --noadjfile if it
is available. This means hwclock will not use a drift file.
X-Gentoo-Bug: 584722
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=584722
init.d/hwclock.in | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index d3e19f1..7fee7b7 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -69,6 +69,16 @@ _hwclock()
return 1
}
+get_noadjfile()
+{
+ if ! yesno $clock_adjfile; then
+ # Some implementations don't handle adjustments
+ if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
+ echo --noadjfile
+ fi
+ fi
+}
+
start()
{
local retval=0 errstr=""
@@ -91,16 +101,16 @@ start()
fi
# Always set the kernel's time zone.
- _hwclock --systz $utc_cmd $clock_args
+ _hwclock --systz $utc_cmd $(get_noadjfile) $clock_args
: $(( retval += $? ))
if [ -e /etc/adjtime ] && yesno $clock_adjfile; then
- _hwclock --adjust $utc_cmd
+ _hwclock --adjust $utc_cmd $(get_noadjfile)
: $(( retval += $? ))
fi
if yesno ${clock_hctosys:-YES}; then
- _hwclock --hctosys $utc_cmd $clock_args
+ _hwclock --hctosys $utc_cmd $(get_noadjfile) $clock_args
: $(( retval += $? ))
fi
@@ -122,14 +132,7 @@ stop()
ebegin "Setting hardware clock using the system clock" "[$utc]"
- if ! yesno $clock_adjfile; then
- # Some implementations don't handle adjustments
- if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then
- utc_cmd="$utc_cmd --noadjfile"
- fi
- fi
-
- _hwclock --systohc $utc_cmd $clock_args
+ _hwclock --systohc $utc_cmd $(get_noadjfile) $clock_args
retval=$?
eend $retval "Failed to sync clocks"
@@ -144,5 +147,5 @@ save()
show()
{
setupopts
- hwclock --show "$utc_cmd" $clock_args
+ hwclock --show "$utc_cmd" $(get_noadjfile) $clock_args
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-07-31 19:06 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-07-31 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 61e211c1c4f51fdb8babb9a70ed7ce138d71c80b
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Jul 31 18:01:17 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jul 31 18:50:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=61e211c1
init.d: initial service adjustments for docker support
Add -docker keyword to the same scripts that have -lxc keyword.
init.d/binfmt.in | 2 +-
init.d/consolefont.in | 2 +-
init.d/devfs.in | 2 +-
init.d/dmesg.in | 2 +-
init.d/fsck.in | 2 +-
init.d/hostname.in | 2 +-
init.d/hwclock.in | 2 +-
init.d/keymaps.in | 2 +-
init.d/localmount.in | 2 +-
init.d/modules.in | 2 +-
init.d/mount-ro.in | 2 +-
init.d/net-online.in | 2 +-
init.d/netmount.in | 2 +-
init.d/numlock.in | 2 +-
init.d/procfs.in | 2 +-
init.d/root.in | 2 +-
init.d/swap.in | 2 +-
init.d/swapfiles.in | 2 +-
init.d/swclock.in | 2 +-
init.d/sysfs.in | 2 +-
init.d/termencoding.in | 2 +-
init.d/urandom.in | 2 +-
22 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/init.d/binfmt.in b/init.d/binfmt.in
index 39978a0..4afb83b 100644
--- a/init.d/binfmt.in
+++ b/init.d/binfmt.in
@@ -15,7 +15,7 @@ depend()
{
after procfs
use modules devfs
- keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index de2d448..9fe95af 100644
--- a/init.d/consolefont.in
+++ b/init.d/consolefont.in
@@ -15,7 +15,7 @@ depend()
{
need localmount termencoding
after hotplug bootmisc modules
- keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
}
start()
diff --git a/init.d/devfs.in b/init.d/devfs.in
index c869326..8038c54 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -15,7 +15,7 @@ depend()
{
provide dev-mount
before dev
- keyword -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -prefix -systemd-nspawn -vserver
}
mount_dev()
diff --git a/init.d/dmesg.in b/init.d/dmesg.in
index a3696d2..641f36f 100644
--- a/init.d/dmesg.in
+++ b/init.d/dmesg.in
@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"
depend()
{
before dev modules
- keyword -lxc -prefix -systemd-nspawn -vserver
+ keyword -docker -lxc -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 005e87f..7d12482 100644
--- a/init.d/fsck.in
+++ b/init.d/fsck.in
@@ -16,7 +16,7 @@ _IFS="
depend()
{
use dev clock modules
- keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml
}
_abort() {
diff --git a/init.d/hostname.in b/init.d/hostname.in
index cc3d148..21ed701 100644
--- a/init.d/hostname.in
+++ b/init.d/hostname.in
@@ -12,7 +12,7 @@
description="Sets the hostname of the machine."
depend() {
- keyword -prefix -systemd-nspawn -lxc
+ keyword -docker -lxc -prefix -systemd-nspawn
}
start()
diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index 7fee7b7..2cd1ef3 100644
--- a/init.d/hwclock.in
+++ b/init.d/hwclock.in
@@ -35,7 +35,7 @@ depend()
else
before *
fi
- keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
}
setupopts()
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index a9da423..dbe054a 100644
--- a/init.d/keymaps.in
+++ b/init.d/keymaps.in
@@ -15,7 +15,7 @@ depend()
{
need localmount termencoding
after bootmisc
- keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
}
start()
diff --git a/init.d/localmount.in b/init.d/localmount.in
index b7de0d8..d2c9321 100644
--- a/init.d/localmount.in
+++ b/init.d/localmount.in
@@ -16,7 +16,7 @@ depend()
need fsck
use lvm modules mtab
after lvm modules
- keyword -jail -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/modules.in b/init.d/modules.in
index 6ff90d6..ff1dee4 100644
--- a/init.d/modules.in
+++ b/init.d/modules.in
@@ -14,7 +14,7 @@ description="Loads a user defined list of kernel modules."
depend()
{
use isapnp
- keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 49bfe62..589f1a2 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -14,7 +14,7 @@ description="Re-mount filesytems read-only for a clean reboot."
depend()
{
need killprocs savecache
- keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/net-online.in b/init.d/net-online.in
index 53855d9..3e18ba9 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -15,7 +15,7 @@ depend()
{
after modules
need sysfs
- keyword -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver
}
get_interfaces()
diff --git a/init.d/netmount.in b/init.d/netmount.in
index ede4d32..7be08e1 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -24,7 +24,7 @@ depend()
want $mywant
use afc-client amd openvpn
use dns
- keyword -jail -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/numlock.in b/init.d/numlock.in
index 950b583..875ffc0 100644
--- a/init.d/numlock.in
+++ b/init.d/numlock.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
depend()
{
need localmount
- keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
_setleds()
diff --git a/init.d/procfs.in b/init.d/procfs.in
index b78afc7..de61873 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -15,7 +15,7 @@ depend()
{
use modules devfs
need localmount
- keyword -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/root.in b/init.d/root.in
index 409a63c..ec22699 100644
--- a/init.d/root.in
+++ b/init.d/root.in
@@ -14,7 +14,7 @@ description="Mount the root fs read/write"
depend()
{
need fsck
- keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/swap.in b/init.d/swap.in
index c6d705d..4fb2b35 100644
--- a/init.d/swap.in
+++ b/init.d/swap.in
@@ -12,7 +12,7 @@
depend()
{
before localmount
- keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in
index f61c4ec..92b5c89 100644
--- a/init.d/swapfiles.in
+++ b/init.d/swapfiles.in
@@ -12,7 +12,7 @@
depend()
{
need localmount
- keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver
}
start()
diff --git a/init.d/swclock.in b/init.d/swclock.in
index b09afad..9ceba44 100644
--- a/init.d/swclock.in
+++ b/init.d/swclock.in
@@ -15,7 +15,7 @@ depend()
{
before *
provide clock
- keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
}
# swclock is an OpenRC built in
diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index cc4007f..6929810 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid
depend()
{
- keyword -lxc -prefix -systemd-nspawn -vserver
+ keyword -docker -lxc -prefix -systemd-nspawn -vserver
}
mount_sys()
diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index a739f97..9f33eb6 100644
--- a/init.d/termencoding.in
+++ b/init.d/termencoding.in
@@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
depend()
{
- keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
+ keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
use root
after bootmisc
}
diff --git a/init.d/urandom.in b/init.d/urandom.in
index 9f4350b..54706ac 100644
--- a/init.d/urandom.in
+++ b/init.d/urandom.in
@@ -15,7 +15,7 @@ description="Initializes the random number generator."
depend()
{
need localmount
- keyword -jail -lxc -openvz -prefix -systemd-nspawn
+ keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn
}
save_seed()
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-08-25 22:03 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-08-25 22:03 UTC (permalink / raw
To: gentoo-commits
commit: c8059c8474cb0aeb6f7f89f7200f5faa73f9a66e
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 25 21:10:45 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 21:58:46 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c8059c84
modules-load.d: cleanups
Move list of directories to a local variable and create the fn variable
to use for an individual file name rather than using path.
init.d/modules-load.in | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 8c19a36..0f80396 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -16,12 +16,11 @@ 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
+ local dirs="/usr/lib/modules-load.d /run/modules-load.d /etc/modules-load.d"
+ local basenames files fn x y
+ for x in $dirs; do
[ ! -d $x ] && continue
for y in $x/*.conf; do
[ -f $y ] && basenames="${basenames}\n${y##*/}"
@@ -29,11 +28,11 @@ find_modfiles()
done
basenames=$(printf "$basenames" | sort -u)
for x in $basenames; do
- for y in $modules_dirs; do
+ for y in $dirs; do
[ -r $y/$x ] &&
- path=$y/$x
+ fn=$y/$x
done
- files="$files $path"
+ files="$files $fn"
done
echo $files
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-08-25 22:03 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-08-25 22:03 UTC (permalink / raw
To: gentoo-commits
commit: 8aa0b5b8a943ad4d94de08a00bc0cbf1530847ee
Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Aug 25 22:02:14 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 22:02:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=8aa0b5b8
init.d: add modules-load to ignore patterns
init.d/.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/init.d/.gitignore b/init.d/.gitignore
index b548177..86305fa 100644
--- a/init.d/.gitignore
+++ b/init.d/.gitignore
@@ -1,4 +1,5 @@
binfmt
+modules-load
bootmisc
fsck
hostname
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-08-25 22:03 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-08-25 22:03 UTC (permalink / raw
To: gentoo-commits
commit: b888f1a8e21008f45105ad2fdc84a5d579892eb5
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 21:58:46 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b888f1a8
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 f256095..ad90f95 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -19,10 +19,10 @@ SRCS-FreeBSD= hostid.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 ff1dee4..ddb8c9b 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
}
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-08-30 14:09 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-08-30 14:09 UTC (permalink / raw
To: gentoo-commits
commit: 5f1daa6f30849d95db1f6b4b84abdc9645db3f94
Author: Doug Freed <dwfreed <AT> mtu <DOT> edu>
AuthorDate: Fri Aug 26 19:23:54 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Aug 26 19:31:59 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5f1daa6f
modules-load: handle comments better
This handles comments without a trailing space after the comment
character.
Reported-By: josef64
init.d/modules-load.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 0f80396..2387a8d 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -44,8 +44,8 @@ load_modules()
[ -z "$file" ] && return 0
while read m x; do
case $m in
- \;) continue ;;
- \#) continue ;;
+ \;*) continue ;;
+ \#*) continue ;;
*) modules="$modules $m"
;;
esac
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/openrc:0.21.x commit in: init.d/
@ 2016-08-31 13:47 William Hubbs
0 siblings, 0 replies; 7+ messages in thread
From: William Hubbs @ 2016-08-31 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 484e6089b90ffef9f53bdc8968c240e1b3a3f221
Author: Martin Väth <martin <AT> mvath <DOT> de>
AuthorDate: Tue Aug 30 17:47:13 2016 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 13:38:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=484e6089
Fix typo in RC_UNAME check of modules-load
The $RC_UNAME "Linux" had been misspelled as "linux".
As a consequence, entries in e.g. /etc/modules-load.d failed to
load any module succesfully under Linux(!)
init.d/modules-load.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/init.d/modules-load.in b/init.d/modules-load.in
index 2387a8d..c8fe422 100644
--- a/init.d/modules-load.in
+++ b/init.d/modules-load.in
@@ -54,7 +54,7 @@ load_modules()
ebegin "Loading module $x"
case "$RC_UNAME" in
FreeBSD) kldload "$x"; rc=$? ;;
- linux) modprobe -q "$x"; rc=$? ;;
+ Linux) modprobe -q "$x"; rc=$? ;;
*) ;;
esac
eend $rc "Failed to load $x"
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-08-31 13:47 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-30 14:09 [gentoo-commits] proj/openrc:0.21.x commit in: init.d/ William Hubbs
-- strict thread matches above, loose matches on Subject: below --
2016-08-31 13:47 William Hubbs
2016-08-25 22:03 William Hubbs
2016-08-25 22:03 William Hubbs
2016-08-25 22:03 William Hubbs
2016-07-31 19:06 William Hubbs
2016-07-06 17:35 William Hubbs
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox