avoid loading /etc/modules contents twice (modules-load.d/modules.conf is symlink...

svn-id: @12626

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 9fe142bc48c570c2a8a9a9aafede079dabc7a5b9..d486c8e797bb5ab269b6cc345a49f044d2ad2e12 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -573,7 +573,10 @@ if ! is_yes "$VSERVER"; then
        # Load modules
        if ! use_upstart; then
                load_kernel_modules modules
-               for f in /etc/modules-load.d/*.conf ; do
+               for f in /etc/modules-load.d/*.conf; do
+                       # already loaded by implicit "modules" load
+                       [ "${f##*/}" = "modules.conf" ] && continue
+
                        [ -r $f ] || continue
                        load_kernel_modules ${f##/etc/}
                done