From e060bec18062ae0a0f719200523880476017c1e0 Mon Sep 17 00:00:00 2001
From: Tom Gundersen <teg@jklm.no>
Date: Sat, 4 Aug 2012 00:43:42 +0200
Subject: modprobe: pass everything to systemd-modules-load

Unify this as much as possible, write out MODULES to a
modules-load.d file in /run before calling systemd-modules-load,
rather than using modprobe directly.

This should not make any difference to the functionality.

Signed-off-by: Tom Gundersen <teg@jklm.no>
---
 functions | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/functions b/functions
index fee1765..e8ff7b8 100644
--- a/functions
+++ b/functions
@@ -357,14 +357,14 @@ print_welcome() {
 load_modules() {
 	local rc=0
 
-	/usr/lib/systemd/systemd-modules-load &>/dev/null
-	rc=$?
-
-	if (( ${#MODULES[*]} )); then
-		modprobe -ab "${MODULES[@]}"
-		(( rc += $? ))
+	if [[ $MODULES ]]; then
+		/usr/lib/systemd/arch-modules-load
+		rc=$?
 	fi
 
+	/usr/lib/systemd/systemd-modules-load
+	(( rc+=$? ))
+
 	return $rc
 }
 
-- 
cgit v1.2.3