Update of /cvsroot/leaf/src/bering-uclibc4/source/initrd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv29218
Modified Files:
buildtool.mk root.linuxrc
Log Message:
Index: root.linuxrc
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/root.linuxrc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** root.linuxrc 24 Jun 2010 13:20:35 -0000 1.8
--- root.linuxrc 24 Jun 2010 22:23:44 -0000 1.9
***************
*** 61,64 ****
--- 61,73 ----
Lecho "Bering - Initrd - $VERSION"
+ # Process kernel command line and assign values to variables
+ [ "$VERBOSE" ] && Lecho "Parsing kernel command line..."
+ for i in `cat /proc/cmdline` ; do
+ case $i in
+ *=*) eval KCMD_$i ;;
+ *) eval KCMD_$i=$i ;;
+ esac
+ done
+
# Load any modules required to boot
ln -s /lib/modules /lib/modules/`uname -r`
***************
*** 69,78 ****
/sbin/mdev -s
- #load device drivers
- for i in `lsalias pnp pci pci_express acpi platform serio`; do
- /sbin/modprobe $i 2>/dev/null
- done
-
- #load non-pnp modules
if [ -r $BPFX/etc/modules ] ; then
# Loop over every line in modules
--- 78,81 ----
***************
*** 89,92 ****
--- 92,104 ----
fi
+ #load device drivers
+ for i in `find /sys/devices -iname modalias`; do
+ /sbin/modprobe `cat $i` 2>/dev/null
+ done
+
+ for i in `echo $KCMD_KMODULES|sed 's/,/ /g'`; do
+ /sbin/modprobe $i 2>/dev/null
+ done
+
# wait for USB drive
sleep $usb_wait
***************
*** 97,109 ****
done
- # Process kernel command line and assign values to variables
- [ "$VERBOSE" ] && Lecho "Parsing kernel command line..."
- for i in `cat /proc/cmdline` ; do
- case $i in
- *=*) eval KCMD_$i ;;
- *) eval KCMD_$i=$i ;;
- esac
- done
-
[ "$VERBOSE2" ] && (echo "Modules loaded:"; lsmod)
--- 109,112 ----
Index: buildtool.mk
===================================================================
RCS file: /cvsroot/leaf/src/bering-uclibc4/source/initrd/buildtool.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** buildtool.mk 24 Jun 2010 13:20:35 -0000 1.10
--- buildtool.mk 24 Jun 2010 22:23:44 -0000 1.11
***************
*** 22,26 ****
ohci-hcd usb-storage sd_mod sr_mod isofs vfat floppy >mod
#cat mod|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules
! echo -e "isofs\nvfat\nata_generic">$(INITRD_TARGET_DIR)/boot/etc/modules
-rm -f files
(BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); for i in `cat mod`; do echo -e
"<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
--- 22,26 ----
ohci-hcd usb-storage sd_mod sr_mod isofs vfat floppy >mod
#cat mod|sed 's/[a-z]*\/[a-z_/-]*\///g; s/\.ko//g; s/
/\n/g'>$(INITRD_TARGET_DIR)/boot/etc/modules
! echo -e "isofs\nvfat">$(INITRD_TARGET_DIR)/boot/etc/modules
-rm -f files
(BT_KERNEL_RELEASE=$(BT_KERNEL_RELEASE); for i in `cat mod`; do echo -e
"<File>\n\tSource\t= lib/modules/$$BT_KERNEL_RELEASE/$$i\n\t\
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
leaf-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits
