the match_flags support

diff -u -3 -p -r1.1 blacklist
@@ -4,7 +4,8 @@
 # no matter which driver happens to get probed first.  Sometimes user
 # mode tools can also control driver binding.
 #
-# Syntax:  driver name alone on a line.  Other lines are ignored.
+# Syntax:  driver name alone (without any ending spaces) on a line. Other
+# lines are ignored.
 #
 
 # uhci ... usb-uhci handles the same pci class

diff -u -3 -p -r1.3 hotplug.functions
@@ -114,15 +114,12 @@ load_drivers ()
     # maybe driver modules need loading and configuring
     for MODULE in $DRIVERS
     do
-	if ! lsmod | grep -q "^$MODULE "
-	then
-	    if grep -q "^$MODULE\$" /etc/hotplug/blacklist >/dev/null 2>&1
-	    then
+	if ! lsmod | grep -q "^$MODULE "; then
+	    if grep -q "^$MODULE\$" /etc/hotplug/blacklist >/dev/null 2>&1; then
 		if [ "$DEBUG" != "" ]; then
 		    mesg "... blacklisted module:  $MODULE"
 		fi
-	    elif ! $MODPROBE $MODULE >/dev/null 2>&1
-	    then
+	    elif ! $MODPROBE $MODULE >/dev/null 2>&1; then
 		mesg "... can't load module $MODULE"
 	    elif [ -x /etc/hotplug/$TYPE/$MODULE ]; then
 		if [ "$DEBUG" != "" ]; then

diff -u -3 -p -r1.3 pci.rc
@@ -27,7 +27,7 @@ fi
 pci_boot_events ()
 {
     LISTER=`type -p pcimodules`
-    if [ x$LISTER = x -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then
+    if [ "$LISTER" = "" -o ! -f /proc/bus/pci/devices -o ! -x pci.agent ]; then
 	    echo $"** can't synthesize pci hotplug events"
 	    return
     fi

@@ -46,10 +46,8 @@ pci_boot_events ()
     # least PCI_CLASS is used by common drivers (USB hcds).
 
     # these notifications will be handled by pcimodules
-    for BUS in `cd /proc/bus/pci;find * -type d -print`
-    do
-	for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`
-	do
+    for BUS in `cd /proc/bus/pci;find * -type d -print`; do
+	for SLOT_FUNC in `cd /proc/bus/pci/$BUS; echo *`; do
 	    PCI_SLOT=$BUS:$SLOT_FUNC
 	    : hotplug pci for $PCI_SLOT
 	    /sbin/hotplug pci

124 lines not on this page · raw message

diff -u -3 -p -r1.7 usb.rc
@@ -94,8 +94,7 @@ maybe_start_usb ()
     if [ -d /proc/bus/usb ]; then
 	# if it's not mounted, try to mount it
 	if [ ! -f /proc/bus/usb/devices ]; then
-	    if grep -q "[	 ]/proc/bus/usb[	 ]" /etc/fstab
-	    then
+	    if grep -q "[	 ]/proc/bus/usb[	 ]" /etc/fstab ; then
 		mount /proc/bus/usb
 	    else
 		mount -t usbdevfs usbdevfs /proc/bus/usb

@@ -131,8 +130,7 @@ maybe_start_usb ()
 
     # if USB is fully modular and yet can clean up,
     # we know init failed without needing usbdevfs
-    elif rmmod usbcore >/dev/null 2>&1
-    then
+    elif rmmod usbcore >/dev/null 2>&1; then
 	return 1
     fi
 

@@ -145,8 +143,7 @@ maybe_start_usb ()
 
     # Some modules are statically loaded, perhaps because they are
     # needed to activate filesystem device nodes.
-    for MODULE in $STATIC_MODULE_LIST
-    do
+    for MODULE in $STATIC_MODULE_LIST; do
 	modprobe $MODULE
     done
 

@@ -223,8 +220,7 @@ case "$1" in
 	    cat /proc/bus/usb/drivers
 	else
 	    echo $"USB-devfs is unavailable. "
-	    if test -f /proc/modules && fgrep -q usbcore /proc/modules
-	    then
+	    if [ -f /proc/modules ] && fgrep -q usbcore /proc/modules; then
 		echo $"USB module is loaded. "
 	    else
 		echo $"USB may be statically linked. "

diff -u -3 -p -r1.2 hotplug
@@ -13,23 +13,25 @@
 
 # source function library
 if [ -f /etc/init.d/functions ]; then
-	. /etc/init.d/functions
+    . /etc/init.d/functions
 elif [ -f /etc/rc.d/init.d/functions ]; then
-	. /etc/rc.d/init.d/functions
+    . /etc/rc.d/init.d/functions
 fi
 
 case "$1" in
     start|restart|status)
-	for RC in /etc/hotplug/*.rc
-	do
-	    $RC $1
+	for RC in /etc/hotplug/*.rc; do
+	    if [ -x $RC ]; then
+		$RC $1 
+	    fi
 	done
 	touch /var/lock/subsys/hotplug
 	;;
     stop)
-	for RC in /etc/hotplug/*.rc
-        do
-            $RC stop
+	for RC in /etc/hotplug/*.rc; do
+	    if [ -x $RC ]; then
+		$RC stop
+	    fi
         done
         rm -f /var/lock/subsys/hotplug
         ;;

@@ -39,3 +41,4 @@ case "$1" in
     exit 1
     ;;
 esac
+

diff -u -3 -p -r1.5 hotplug
@@ -35,7 +35,7 @@ fi
 #
 if [ $# -lt 1 -o "$1" = "help" -o "$1" = "--help" ]; then
     if [ -t ]; then
-	echo "Usage: $0 AgentName ..."
+	echo "Usage: $0 AgentName [AgentArguments]"
 
 	AGENTS=""
 	for AGENT in /etc/hotplug/*.agent ; do

@@ -63,7 +63,7 @@ AGENT=/etc/hotplug/$1.agent
 if [ -x $AGENT ]; then
     shift
     if [ "$DEBUG" != "" ]; then
-	mesg "invoke $AGENT"
+	mesg "invoke $AGENT ($@)"
     fi
     exec $AGENT "$@"
     mesg "couldn't exec $AGENT"