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

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

[Colin D Bennett]

[-- 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 --]

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

[Vesa Jääskeläinen]

Colin D Bennett wrote:
> This is the first of many patches that I will be posting of my Google
> Summer of Code 2008 work on GRUB.

Hi Colin,

Thanks for your patches so far. I don't think we can handle them all
before you go to your holiday but we will try to be a bit more flexible
this time, so if there is not big fixes to be made, we do them and
commit them.

Thanks again for your work for GSoC 2008. I hope we can integrated this
feature as soon as possible so others can also enjoy what it brings.

Thanks,
Vesa Jääskeläinen

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

[Colin D Bennett]

[-- Attachment #1: Type: text/plain, Size: 1124 bytes --]

On Sun, 31 Aug 2008 12:32:59 +0300
Vesa Jääskeläinen <chaac@nic.fi> wrote:

> Colin D Bennett wrote:
> > This is the first of many patches that I will be posting of my
> > Google Summer of Code 2008 work on GRUB.
> 
> Hi Colin,
> 
> Thanks for your patches so far. I don't think we can handle them all
> before you go to your holiday but we will try to be a bit more
> flexible this time, so if there is not big fixes to be made, we do
> them and commit them.

OK.  I'll try to get as much as possible posted before I go, at least.
If, after review, it is determined that some things need to be done
differently, I can make minor fixes in the next couple days, or when I
get back I can tackle somewhat larger changes.

> Thanks again for your work for GSoC 2008. I hope we can integrated
> this feature as soon as possible so others can also enjoy what it
> brings.
> 
> Thanks,
> Vesa Jääskeläinen

It's been a great experience working on GRUB with you all, and I also
look forward to seeing the code integrated into GRUB's mainline and
getting more people testing it.

Regards,
Colin

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

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

[Robert Millan]

On Sat, Aug 30, 2008 at 11:43:41PM -0700, Colin D Bennett wrote:
> === 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

Hi,

I'd suggest mentioning in --help that --overlay can be specified multiple
times.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."

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

[Colin D Bennett]

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

On Sun, 31 Aug 2008 15:49:45 +0200
Robert Millan <rmh@aybabtu.com> wrote:

> Hi,
> 
> I'd suggest mentioning in --help that --overlay can be specified
> multiple times.

It is so.  New patch attached.

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: 1355 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-31 15:32:33 +0000
@@ -43,6 +43,7 @@
   -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 @@
     --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 @@
   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 --]

Re: [PATCH] GSoC #01 grub-mkrescue i386-pc multiple overlays (v2)

[Robert Millan]

On Sun, Aug 31, 2008 at 09:07:40AM -0700, Colin D Bennett wrote:
> On Sun, 31 Aug 2008 15:49:45 +0200
> Robert Millan <rmh@aybabtu.com> wrote:
> 
> > Hi,
> > 
> > I'd suggest mentioning in --help that --overlay can be specified
> > multiple times.
> 
> It is so.  New patch attached.

Thanks!  I checked this in.

-- 
Robert Millan

  The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and
  how) you may access your data; but nobody's threatening your freedom: we
  still allow you to remove your data and not access it at all."