geninitrd/trunk/geninitrd

[arekm]

Author: arekm
Date: Thu Aug 17 10:41:01 2006
New Revision: 7672

Modified:
   geninitrd/trunk/geninitrd
Log:
Simplify firmware loader script.

Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd	(original)
+++ geninitrd/trunk/geninitrd	Thu Aug 17 10:41:01 2006
@@ -667,25 +667,10 @@
 		mkdir -p $MNTIMAGE/lib/firmware
 cat << 'EOF' >> "$MNTIMAGE/lib/firmware/firmware.sh"
 #!/bin/sh -e
-
-FIRMWARE_DIRS="/lib/firmware"
-
-if [ ! -e /sys$DEVPATH/loading ]; then
-    echo "firmware loader misses sysfs directory" >&2
-    exit 1
-fi
-
-for DIR in $FIRMWARE_DIRS; do
-    [ -e "$DIR/$FIRMWARE" ] || continue
-    echo 1 > /sys$DEVPATH/loading
-    cat "$DIR/$FIRMWARE" > /sys$DEVPATH/data
-    echo 0 > /sys$DEVPATH/loading
-    exit 0
-done
-
-echo -1 > /sys$DEVPATH/loading
-echo "Cannot find  firmware file '$FIRMWARE'" >&2
-exit 1
+echo 1 > /sys$DEVPATH/loading
+cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
+echo 0 > /sys$DEVPATH/loading
+exit 0
 EOF
     	chmod 755 "$MNTIMAGE/lib/firmware/firmware.sh"
 	fi