New ability to specify volume labels in "dont_scan_dirs" token to

[refind] / mkcdimage

diff --git a/mkcdimage b/mkcdimage
index ff58829ce47788bc7fa1cb760c5f5cb15887e13a..648da71929c1204b47bd507c8c69b0d6890c3a18 100755 (executable)
--- a/mkcdimage
+++ b/mkcdimage
@@ -39,6 +39,14 @@ ln ../../refind/refind.conf-sample ./refind.conf
 mkdir icons
 cd icons
 ln ../../../refind/icons/* ./
+cd ../
+mkdir drivers_x64
+cd drivers_x64
+ln ../../../refind/drivers_x64/* ./
+cd ..
+mkdir drivers_ia32
+cd drivers_ia32
+ln ../../../refind/drivers_x64/* ./
 cd ../../..
 
 # Get the size of the binaries to go in the El Torito image in kB
@@ -53,7 +61,7 @@ mv EFI/boot/shell*.efi ./
 # Prepare a FAT filesystem image and populate it with the
 # EFI boot files....
 dd if=/dev/zero of=refind-bin-$Version.img bs=1024 count=$ToritoSize
-mkdosfs -n "rEFInd.ET" refind-bin-$Version.img
+mkdosfs -n "ElTorito" refind-bin-$Version.img
 mcopy -irefind-bin-$Version.img -s EFI shell*.efi ::/
 
 # Make the ISO-9660 image file....
@@ -74,6 +82,10 @@ mkisofs -A "Bootable rEFInd" -V "rEFInd $Version" -volset "rEFInd $Version" \
 # Create a bootable USB flash drive image, using the FAT filesystem
 # created above and a stored partition table image (plus some empty
 # sectors)....
+#
+# Note: Seems to work on only a few systems, so I'm not distributing
+# the resulting images yet....
+#
 rm ../../refind-flashdrive-$Version.*
 cat $StartDir/flashparts.img refind-bin-$Version.img > refind-flashdrive-$Version.img
 cp $StartDir/README-flashdrive.txt ./
@@ -82,6 +94,7 @@ mv refind-bin-$Version refind-flashdrive-$Version
 zip -9r ../refind-flashdrive-$Version.zip \
     refind-flashdrive-$Version/refind-flashdrive-$Version.img \
     refind-flashdrive-$Version/docs refind-flashdrive-$Version/LICENSE.txt \
+    refind-flashdrive-$Version/install.sh \
     refind-flashdrive-$Version/COPYING.txt \
     refind-flashdrive-$Version/CREDITS.txt \
     refind-flashdrive-$Version/README.txt \
@@ -92,7 +105,7 @@ mv refind-flashdrive-$Version/refind-flashdrive-$Version.img ../
 cd ../
 
 # Zip up the optical disc image....
-rm refind-cd-$Version.zip
+rm -f refind-cd-$Version.zip
 zip -9 refind-cd-$Version.zip refind-cd-$Version.iso
 
-#rm -r temp/
+rm -r temp/