Author: caleb
Date: Mon Aug 13 12:43:03 2012
New Revision: 12579
Modified:
livecd/mklive/mklive
Log:
- Fixed bug in firmware packaging routine. Wrong variable was being cleared and
the file copy code was being executed even after the file is determined to be
missing.
Modified: livecd/mklive/mklive
==============================================================================
--- livecd/mklive/mklive (original)
+++ livecd/mklive/mklive Mon Aug 13 12:43:03 2012
@@ -54,12 +54,12 @@
do
# find file path
firmwareDirs="lib/firmware/updates/$kernel_rel
lib/firmware/updates lib/firmware/$kernel_rel lib/firmware"
- unset firmwareDir
+ unset firmwareDirFound
for firmwareDir in $firmwareDirs
do
[ -f $sys_source/$firmwareDir/$firmwareFile ]
&& firmwareDirFound=$firmwareDir && continue
done
- [ -z $firmwareDirFound ] && echo "No firmware:
$firmwareFile found"
+ [ -z $firmwareDirFound ] && echo "Warning: Firmware
file $firmwareFile not found" && continue
# copy files to initrd skeleton
dstFirmDir=$(dirname
$tmp_initrd/$firmwareDirFound/$firmwareFile)
[ ! -d $dstFirmDir ] && mkdir -p $dstFirmDir
@@ -107,7 +107,7 @@
echo "Copying kernel modules to initrd skeleton..."
copy_module loop cdrom crc16 crc-t10dif unionfs isofs squashfs vfat
- copy_module usbhid hid ehci-hcd uhci-hcd ohci-hcd xhci-hcd usb-storage
sr_mod uas scsi_dh sg sd_mod libata usb-libusual nls_iso8859-1 nls_cp437
+ copy_module usbhid hid ehci-hcd uhci-hcd ohci-hcd xhci-hcd usb-storage
sr_mod uas scsi_dh sg sd_mod libata usb-libusual nls_iso8859-1 nls_cp437
copy_modules_dir kernel/drivers/ata kernel/drivers/scsi
[ -d $sys_source/lib/modules/$kernel_rel/kernel/fs/aufs ] && echo
"found aufs module" && aufs_module_found=1 && copy_module aufs
echo "Copying firmware files to initrd skeleton..."
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
