* loader2/net.c (chooseNetworkInterface): Skip devices that do not

        have firmware loaded (#251941).

        * scripts/upd-instroot: Add *-firmware to PACKAGES for now.  We'll
        change this later once the kernel provides us with more
        info (#177452).

        * scripts/mk-images (makeinitrd): Remove arch test for copying over
        firmware files.  Just check the module list and copy firmware, also
        add atmel and iwl4965 (#177452).

2 files changed, 38 insertions, 27 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 80c6d171f..e1276b23a 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -585,30 +585,41 @@ makeinitrd() {
         cp $IMGPATH/usr/sbin/cmsfs* $MBD_DIR/sbin/
     fi
 
-    if [ "$BUILDARCH" = "i386" -o "$BUILDARCH" = "x86_64" ]; then
-        for module in $INITRDMODULES ; do
-            case $module in
-                ipw2100)
-                    mkdir -p $MBD_DIR/lib/firmware
-                    cp $IMGPATH/lib/firmware/ipw2100* $MBD_DIR/lib/firmware
-                    ;;
-                ipw2200)
-                    mkdir -p $MBD_DIR/lib/firmware
-                    cp $IMGPATH/lib/firmware/ipw-2.4* $MBD_DIR/lib/firmware
-                    cp $IMGPATH/lib/firmware/ipw2200* $MBD_DIR/lib/firmware
-                    ;;
-                iwl3945)
-                    mkdir -p $MBD_DIR/lib/firmware
-                    cp $IMGPATH/lib/firmware/iwlwifi-3945* $MBD_DIR/lib/firmware
-                    ;;
-                zd1211)
-                    mkdir -p $MBD_DIR/lib/firmware/zd1211
-                    cp $IMGPATH/lib/firmware/zd1211/* \
-                       $MBD_DIR/lib/firmware/zd1211
-                    ;;
-            esac
-        done
-    fi
+    # Copy in driver firmware we want during installation.  NOTE:  This isn't
+    # the ideal solution, but we'll do this for now.  What we really want is
+    # for the kernel modules to include a modinfo field that names the firmware
+    # file we should have.  If we can get that it would make it even easier to
+    # push the kernel people to depend on the firmware packages in the kernel,
+    # but we have to take small steps first.
+    for module in $INITRDMODULES ; do
+        case $module in
+            ipw2100)
+                mkdir -p $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/ipw2100* $MBD_DIR/lib/firmware
+                ;;
+            ipw2200)
+                mkdir -p $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/ipw-2.4* $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/ipw2200* $MBD_DIR/lib/firmware
+                ;;
+            iwl3945)
+                mkdir -p $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/iwlwifi-3945* $MBD_DIR/lib/firmware
+                ;;
+            iwl4965)
+                mkdir -p $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/iwlwifi-4965* $MBD_DIR/lib/firmware
+                ;;
+            atmel)
+                mkdir -p $MBD_DIR/lib/firmware
+                cp $IMGPATH/lib/firmware/atmel_*.bin $MBD_DIR/lib/firmware
+                ;;
+            zd1211rw)
+                mkdir -p $MBD_DIR/lib/firmware/zd1211
+                cp $IMGPATH/lib/firmware/zd1211/* $MBD_DIR/lib/firmware/zd1211
+                ;;
+        esac
+    done
 
     if [ -n "$INITRDMODULES" ]; then
 	MODSET=`expandModuleSet "$INITRDMODULES"`
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 0b2b0dec6..ffe3b00fd 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -252,11 +252,11 @@ PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
 	 yum-metadata-parser gfs2-utils libvolume_id nash yum-fedorakmod
 	 libdhcp libnl libdhcp6client libdhcp4client newt-python
 	 device-mapper device-mapper-libs dmraid keyutils-libs libsemanage-python
-	 python-pyblock mkinitrd libbdevid libbdevid-python nss nspr"
+	 python-pyblock mkinitrd libbdevid libbdevid-python nss nspr
+	 *-firmware"
 
 if [ $ARCH = i386 -o $ARCH = x86_64 ]; then
-    PACKAGES="$PACKAGES pcmciautils ipw2100-firmware ipw2200-firmware
-              iwl3945-firmware zd1211-firmware"
+    PACKAGES="$PACKAGES pcmciautils"
 fi
 
 if [ $ARCH = i386 -o $ARCH = x86_64 -o $ARCH = ia64 ]; then