From f56dedb8ce87d598799e497c5c848ec460907a53 Mon Sep 17 00:00:00 2001 From: robertmh Date: Sun, 31 Aug 2008 16:28:32 +0000 Subject: [PATCH] 2008-08-31 Colin D Bennett * util/i386/pc/grub-mkrescue.in: Support multiple overlay directories. git-svn-id: svn://svn.savannah.gnu.org/grub/trunk/grub2@1840 d0de0278-0dc1-4c01-8a07-af38b3205e46 --- ChangeLog | 4 ++++ util/i386/pc/grub-mkrescue.in | 10 ++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2931813e..3c02678f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-08-31 Colin D Bennett + * util/i386/pc/grub-mkrescue.in: Support multiple overlay directories. + +2008-08-31 Colin D Bennett + * commands/i386/pc/vbeinfo.c (grub_cmd_vbeinfo): Show VBE version and total video memory in 'vbeinfo' output; show color format details for each video mode. diff --git a/util/i386/pc/grub-mkrescue.in b/util/i386/pc/grub-mkrescue.in index 83f4ee19..3a74b06d 100644 --- a/util/i386/pc/grub-mkrescue.in +++ b/util/i386/pc/grub-mkrescue.in @@ -43,6 +43,7 @@ Make GRUB rescue image. -v, --version print the version information and exit --modules=MODULES pre-load specified modules MODULES --overlay=DIR overlay directory DIR in the memdisk image + (may be specified multiple times) --pkglibdir=DIR use images from directory DIR instead of ${pkglibdir} --grub-mkimage=FILE use FILE as grub-mkimage --image-type=TYPE select floppy or cdrom (default) @@ -71,7 +72,7 @@ for option in "$@"; do --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 +125,10 @@ for i in ${modules} ; do 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 -- 2.11.4.GIT