Author: glen Date: Mon Feb 11 23:23:36 2013 New Revision: 12626 Modified: rc-scripts/trunk/rc.d/rc.sysinit Log: avoid loading /etc/modules contents twice (modules-load.d/modules.conf is symlink to that)
Modified: rc-scripts/trunk/rc.d/rc.sysinit ============================================================================== --- rc-scripts/trunk/rc.d/rc.sysinit (original) +++ rc-scripts/trunk/rc.d/rc.sysinit Mon Feb 11 23:23:36 2013 @@ -573,7 +573,10 @@ # 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 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit