[PATCH] GSoC #01 grub-mkrescue i386-pc multiple overlays

[Colin D Bennett <colin@gibibit.com>]

[-- Attachment #1.1: Type: text/plain, Size: 380 bytes --]

This is the first of many patches that I will be posting of my Google
Summer of Code 2008 work on GRUB.

This patch adds support to the 'grub-mkrescue' command on the i386-pc
platform for specifying multiple '--overlay' options.  Each --overlay
option will result in the later overlays potentially overriding the
earlier ones if file names are the same.

Regards,
Colin

[-- Attachment #1.2: 01_ChangeLog.txt --]
[-- Type: text/plain, Size: 124 bytes --]

2008-08-30  Colin D Bennett <colin@gibibit.com>

	* util/i386/pc/grub-mkrescue.in: Support multiple overlay directories.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 01_grub-mkrescue-i386-pc-multiple-overlays.patch --]
[-- Type: text/x-patch; name=01_grub-mkrescue-i386-pc-multiple-overlays.patch, Size: 877 bytes --]

=== modified file 'util/i386/pc/grub-mkrescue.in'
--- util/i386/pc/grub-mkrescue.in	2008-07-12 14:40:50 +0000
+++ util/i386/pc/grub-mkrescue.in	2008-08-30 18:33:46 +0000
@@ -71,7 +71,7 @@
     --modules=*)
 	modules=`echo "$option" | sed 's/--modules=//'` ;;
     --overlay=*)
-	overlay=`echo "$option" | sed 's/--overlay=//'` ;;
+	overlay=${overlay}${overlay:+ }`echo "$option" | sed 's/--overlay=//'` ;;
     --pkglibdir=*)
 	input_dir=`echo "$option" | sed 's/--pkglibdir=//'` ;;
     --grub-mkimage=*)
@@ -124,9 +124,10 @@
   echo "insmod $i"
 done > ${aux_dir}/boot/grub/grub.cfg
 
-if test "x$overlay" = x ; then : ; else
-  cp -dpR ${overlay}/* ${aux_dir}/
-fi
+for d in ${overlay}; do
+  echo "Overlaying $d"
+  cp -dpR "${d}"/* "${aux_dir}"/
+done
 
 if [ "x${image_type}" = xfloppy -o "x${emulation}" = xfloppy ] ; then
   # build memdisk


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]