diff options
author | Tom Gundersen <teg@jklm.no> | 2012-08-04 00:43:42 +0200 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2012-08-04 00:50:08 +0200 |
commit | e060bec18062ae0a0f719200523880476017c1e0 (patch) | |
tree | 38e2396f2b76de5afcf8b87833af21cc4c862c85 | |
parent | feb7b6e36af0bcf05c20abbaa548ecae170903a8 (diff) |
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>
-rw-r--r-- | functions | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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 } |