Author: glen
Date: Wed Jun 12 00:17:33 2013
New Revision: 12693
Modified:
rc-scripts/trunk/rc.d/rc.sysinit
Log:
unify modprobe alias lookups
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:17:33 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[\t ]+usb-controller/ {
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 ieee1394-controller/ {
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
@@ -716,12 +716,12 @@
# Load sound modules if they need persistent DMA buffers
if modprobe_c | grep -q "^options sound dmabuf=1"; then
RETURN=0
- alias=$(modprobe_c | grep -sE
"^alias[[:space:]]+sound[[:space:]]+" 2>/dev/null | awk '{ print $3 }')
+ alias=$(modprobe_c | awk
'/^alias[[:space:]]+sound[[:space:]]+/{ print $3 }')
if [ -n "$alias" -a "$alias" != "off" ] ; then
run_cmd "$(nls 'Loading sound module') ($alias)"
modprobe -s $alias
RETURN=$?
fi
- alias=$(modprobe_c | grep -sE
"^alias[[:space:]]+sound-slot-0[[:space:]]+" 2>/dev/null | awk '{ 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
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
