From de2057b81ace46af1468a5471be8ebe069203596 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Mon, 31 Oct 2011 19:19:37 +0000 Subject: [PATCH] - give admin the ability to load some kernel modules before udev kicks in svn-id: @12400 --- rc.d/rc.sysinit | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index c6fdd23c..267eab24 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -83,6 +83,7 @@ clean_vserver_mtab() { # Loads modules from /etc/modules, /etc/modules.X.Y and /etc/modules.X.Y.Z load_kernel_modules() { + local modules_file=$1 local _x _y _z v v1 old_IFS kernel kerneleq { read _x _y v _z @@ -102,7 +103,7 @@ load_kernel_modules() { local module args # Loop over every line in modules file ( \ - grep -hvE '^(#|[[:blank:]]*$)' /etc/modules /etc/modules.$kernel /etc/modules.$kerneleq 2>/dev/null + grep -hvE '^(#|[[:blank:]]*$)' /etc/$modules_file /etc/$modules_file.$kernel /etc/$modules_file.$kerneleq 2>/dev/null echo '' # make sure there is a LF at the end ) | while read module args; do [ -z "$module" ] && continue @@ -261,6 +262,7 @@ if ! is_yes "$VSERVER"; then fi if ! is_no "$START_UDEV" && [ -x /sbin/start_udev ]; then + load_kernel_modules modules.preudev /sbin/start_udev [ -x /sbin/initctl ] && /sbin/initctl -q start udev elif [ -x /lib/firmware/firmware-loader.sh ]; then @@ -561,7 +563,7 @@ if ! is_yes "$VSERVER"; then # Load modules if ! use_upstart; then - load_kernel_modules + load_kernel_modules modules fi if [ -x /sbin/multipath ] && ! is_no "$DM_MULTIPATH"; then -- 2.44.0