[Balloon-svn] r1182 - in balloon/trunk/rootfs/emdebian: . fi…

Author: codehelp
Date: 2010-07-06 11:14:15 +0100 (Tue, 06 Jul 2010)
New Revision: 1182

Added:
balloon/trunk/rootfs/emdebian/files/firmware/
Modified:
balloon/trunk/rootfs/emdebian/rootfs-config
Log:
Move the firmware into the rootfs, instead of the balloon3-config package.

Modified: balloon/trunk/rootfs/emdebian/rootfs-config
===================================================================
--- balloon/trunk/rootfs/emdebian/rootfs-config    2010-07-06 10:10:42 UTC (rev 1181)
+++ balloon/trunk/rootfs/emdebian/rootfs-config    2010-07-06 10:14:15 UTC (rev 1182)
@@ -48,9 +48,8 @@
         if [ ! -d $ROOTFS/etc/network ]; then mkdir -p $ROOTFS/etc/network; fi
         if [ ! -d $ROOTFS/etc/init.d ]; then mkdir -p $ROOTFS/etc/init.d; fi
         if [ ! -d $ROOTFS/etc/dhcp3 ]; then mkdir -p $ROOTFS/etc/dhcp3; fi
-        if [ ! -d $ROOTFS/etc/apt/apt.conf.d/ ]; then 
-          mkdir -p $ROOTFS/etc/apt/apt.conf.d/
-        fi
+        if [ ! -d $ROOTFS/lib/firmware ]; then mkdir -p $ROOTFS/lib/firmware; fi
+        if [ ! -d $ROOTFS/etc/apt/apt.conf.d/ ]; then mkdir -p $ROOTFS/etc/apt/apt.conf.d/; fi
         cp -v $CONFIG/fstab $ROOTFS/etc/fstab
         cp -v $CONFIG/interfaces $ROOTFS/etc/network/interfaces
         cp -v $CONFIG/modules $ROOTFS/etc/modules
@@ -58,6 +57,8 @@
         cp -v $CONFIG/urandom $ROOTFS/etc/init.d/
         cp -v $CONFIG/inittab $ROOTFS/etc/
         cp -v $CONFIG/10disablerecommends $ROOTFS/etc/apt/apt.conf.d/
+        cp -v $CONFIG/firmware/libertas_cs.fw $ROOTFS/lib/firmware/
+        cp -v $CONFIG/firmware/libertas_cs_helper.fw $ROOTFS/lib/firmware
         # making devices so far missing between old and new multistrap versions preventing
         # chroot from running into newly untarred rootfs
         (cd $ROOTFS/dev; /sbin/MAKEDEV -v std )
@@ -81,8 +82,6 @@
         fi

 # stuff that can be left to 2nd stage:
-        #Set root password
-#        echo root:rootme | chpasswd
         (cd $ROOTFS/dev; ln -sf urandom random)
         #use bash, not dash - saves 10 seconds 
         # ... but we don't have dash ...