[PATCH 12/12] Fix up copying of firmware.

[Chris Lumens <clumens@xxxxxxxxxx>]

---
 scripts/mk-images    |   12 ++++++------
 scripts/upd-instroot |    2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/scripts/mk-images b/scripts/mk-images
index 39aed4c..da9b508 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -296,7 +296,7 @@ makemoduletree() {
     echo "Copying required firmware..."
     find $MMB_DIR/lib/modules/ -name *.ko | while read module ; do
         for fw in $(modinfo -F firmware $module); do
-            dest=$MBD_DIR/firmware/$fw
+            dest=$MMB_DIR/firmware/$fw
             destdir=$(dirname $dest)
 
             # Some firmware files are expected to be in their own directories.
@@ -314,19 +314,19 @@ makemoduletree() {
     for module in $MODSET ; do
         case $module in
             ipw2100)
-                cp $KERNELROOT/lib/firmware/ipw2100* $MBD_DIR/firmware
+                cp $KERNELROOT/lib/firmware/ipw2100* $MMB_DIR/firmware
             ;;
             ipw2200)
-                cp $KERNELROOT/lib/firmware/ipw2200* $MBD_DIR/firmware
+                cp $KERNELROOT/lib/firmware/ipw2200* $MMB_DIR/firmware
             ;;
             iwl3945)
-                cp $KERNELROOT/lib/firmware/iwlwifi-3945* $MBD_DIR/firmware
+                cp $KERNELROOT/lib/firmware/iwlwifi-3945* $MMB_DIR/firmware
             ;;
             atmel)
-                cp $KERNELROOT/lib/firmware/atmel_*.bin $MBD_DIR/firmware
+                cp $KERNELROOT/lib/firmware/atmel_*.bin $MMB_DIR/firmware
             ;;
             zd1211rw)
-                cp -r $KERNELROOT/lib/firmware/zd1211 $MBD_DIR/firmware
+                cp -r $KERNELROOT/lib/firmware/zd1211 $MMB_DIR/firmware
             ;;
         esac
     done
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 9646f77..7c91afb 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -1301,8 +1301,6 @@ sed -i "s,^MANPATH[^_MAP][ \t]*,&/mnt/sysimage," $DEST/etc/man.config
 sed -i "s,^MANPATH_MAP[ \t]*[a-zA-Z0-9/]*[ \t]*,&/mnt/sysimage," $DEST/etc/man.config
 
 echo "Scrubbing tree..." "$DEST"
-ln -snf /modules $DEST/lib/modules
-ln -snf /firmware $DEST/lib/firmware
 
 mv $DEST/etc/yum.repos.d $DEST/etc/anaconda.repos.d
 
-- 
1.7.1.1

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list