summary refs log tree commit diff
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2015-03-26 13:48:02 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2015-03-26 13:52:58 +0100
commitf8302019dedefa0425f686ed707300df80881caa (patch)
tree2498bc0dde23f44d684f5602aa7331ccc9ebc102
parent7e86828338eac262286d659cbcd4c90ff770d7b1 (diff)
downloadrunit-void-f8302019dedefa0425f686ed707300df80881caa.tar.gz
runit-void-f8302019dedefa0425f686ed707300df80881caa.tar.xz
runit-void-f8302019dedefa0425f686ed707300df80881caa.zip
Remove ability to declare kernel modules in rc.conf
The preferred way is to declare them in /etc/modules-load.d so why offer
an additional way? This isn't perl.
-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=""