Author: glen Date: Wed Jun 12 00:19:05 2013 New Revision: 12694 Modified: rc-scripts/trunk/rc.d/rc.sysinit Log: handle kmod translating `-` to `_`
Modified: rc-scripts/trunk/rc.d/rc.sysinit ============================================================================== --- rc-scripts/trunk/rc.d/rc.sysinit (original) +++ rc-scripts/trunk/rc.d/rc.sysinit Wed Jun 12 00:19:05 2013 @@ -488,7 +488,7 @@ # Initialize USB controllers usb=0 if [ -z "$nousb" ] && ! is_fsmounted usbfs /proc/bus/usb; then - aliases=$(modprobe_c | awk '/^alias[[:space:]]+usb-controller[[:space:]]+/{ print $3 }') + aliases=$(modprobe_c | awk '/^alias[[:space:]]+usb[-_]controller[[:space:]]+/{ print $3 }') if [ -n "$aliases" -a "$aliases" != "off" ] ; then modprobe -s usbcore for alias in $aliases ; do @@ -703,7 +703,7 @@ # Load firewire devices if [ -z "$nofirewire" ]; then - aliases=$(modprobe_c | awk '/^alias[[:space:]]+ieee1394-controller[[:space:]]+/{ print $3 }') + aliases=$(modprobe_c | awk '/^alias[[:space:]]+ieee1394[-_]controller[[:space:]]+/{ print $3 }') if [ -n "$aliases" -a "$aliases" != "off" ] ; then for alias in $aliases ; do [ "$alias" = "off" ] && continue @@ -721,7 +721,7 @@ run_cmd "$(nls 'Loading sound module') ($alias)" modprobe -s $alias RETURN=$? fi - alias=$(modprobe_c | awk '/^alias[[:space:]]+sound-slot-0[[:space:]]+/ { print $3 }') + alias=$(modprobe_c | awk '/^alias[[:space:]]+sound[-_]slot[-_]0[[:space:]]+/ { print $3 }') if [ -n "$alias" -a "$alias" != "off" ] ; then run_cmd "$(nls 'Loading sound module') ($alias)" modprobe -s $alias RETURN=$? _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit