summary refs log tree commit diff
diff options
context:
space:
mode:
authorJuan RP <xtraeme@gmail.com>2015-03-27 05:05:47 +0100
committerJuan RP <xtraeme@gmail.com>2015-03-27 05:05:47 +0100
commit03d9a47488e6775cbe1e983863564b2e00d2183a (patch)
treeea648ec91e94c291f4494da33f616f3b2ef0bdb1
parente24d4da6db0b0d792b8199b59d49b528facdfab5 (diff)
parentf8302019dedefa0425f686ed707300df80881caa (diff)
downloadrunit-void-03d9a47488e6775cbe1e983863564b2e00d2183a.tar.gz
runit-void-03d9a47488e6775cbe1e983863564b2e00d2183a.tar.xz
runit-void-03d9a47488e6775cbe1e983863564b2e00d2183a.zip
Merge pull request #29 from nmeum/modules
Remove ability to declare kernel modules in rc.conf
-rw-r--r--core-services/07-kmods.sh2
-rw-r--r--rc.conf7
2 files changed, 1 insertions, 8 deletions
diff --git a/core-services/07-kmods.sh b/core-services/07-kmods.sh
index 955d1c0..9d904c7 100644
--- a/core-services/07-kmods.sh
+++ b/core-services/07-kmods.sh
@@ -3,5 +3,5 @@
 [ -n "$VIRTUALIZATION" ] && return 0
 
 msg "Loading kernel modules..."
-modules-load -v ${MODULES} | tr '\n' ' ' | sed 's:insmod [^ ]*/::g; s:\.ko\(\.gz\)\? ::g'
+modules-load -v | tr '\n' ' ' | sed 's:insmod [^ ]*/::g; s:\.ko\(\.gz\)\? ::g'
 echo
diff --git a/rc.conf b/rc.conf
index 2be64f9..5dbad2e 100644
--- a/rc.conf
+++ b/rc.conf
@@ -27,10 +27,3 @@
 
 # Amount of ttys which should be setup.
 #TTYS=
-
-# Kernel modules to load, delimited by blanks.
-#
-# NOTE: it's preferred to declare the modules in /etc/modules-load.d instead:
-# 	- echo kmod > /etc/modules-load.d/kmod.conf
-#
-#MODULES=""