From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KZpSx-0002mn-Al for mharc-grub-devel@gnu.org; Sun, 31 Aug 2008 12:07:51 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZpSw-0002lI-1a for grub-devel@gnu.org; Sun, 31 Aug 2008 12:07:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZpSu-0002iW-8H for grub-devel@gnu.org; Sun, 31 Aug 2008 12:07:49 -0400 Received: from [199.232.76.173] (port=46423 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZpSt-0002iG-Qx for grub-devel@gnu.org; Sun, 31 Aug 2008 12:07:47 -0400 Received: from gateway04.websitewelcome.com ([64.5.50.5]:56921) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1KZpSt-0002g1-Fq for grub-devel@gnu.org; Sun, 31 Aug 2008 12:07:47 -0400 Received: (qmail 5667 invoked from network); 31 Aug 2008 16:17:10 -0000 Received: from gator297.hostgator.com (74.53.228.114) by gateway04.websitewelcome.com with SMTP; 31 Aug 2008 16:17:10 -0000 Received: from c-67-185-142-228.hsd1.wa.comcast.net ([67.185.142.228]:55732 helo=gamma.lan) by gator297.hostgator.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1KZpSp-0005gK-MC for grub-devel@gnu.org; Sun, 31 Aug 2008 11:07:43 -0500 Date: Sun, 31 Aug 2008 09:07:40 -0700 From: Colin D Bennett To: grub-devel@gnu.org Message-ID: <20080831090740.205b76a0@gamma.lan> In-Reply-To: <20080831134945.GE2688@thorin> References: <20080830234341.662e6132@gamma.lan> <20080831134945.GE2688@thorin> X-Mailer: Claws Mail 3.5.0 (GTK+ 2.12.11; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/AJkZ8oJpZP5KVezc7oM_3IV"; protocol="application/pgp-signature"; micalg=PGP-SHA1 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator297.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gibibit.com X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: [PATCH] GSoC #01 grub-mkrescue i386-pc multiple overlays (v2) X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2008 16:07:50 -0000 --Sig_/AJkZ8oJpZP5KVezc7oM_3IV Content-Type: multipart/mixed; boundary="MP_/YAXIfjrosztTx2CfANCXIEg" --MP_/YAXIfjrosztTx2CfANCXIEg Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Sun, 31 Aug 2008 15:49:45 +0200 Robert Millan wrote: > Hi, >=20 > I'd suggest mentioning in --help that --overlay can be specified > multiple times. It is so. New patch attached. Regards, Colin --MP_/YAXIfjrosztTx2CfANCXIEg Content-Type: text/plain; name=01_ChangeLog.txt Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=01_ChangeLog.txt 2008-08-30 Colin D Bennett * util/i386/pc/grub-mkrescue.in: Support multiple overlay directories. --MP_/YAXIfjrosztTx2CfANCXIEg Content-Type: text/x-patch; name=01_grub-mkrescue-i386-pc-multiple-overlays.patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=01_grub-mkrescue-i386-pc-multiple-overlays.patch =3D=3D=3D 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=3DMODULES pre-load specified modules MODULES --overlay=3DDIR overlay directory DIR in the memdisk image + (may be specified multiple times) --pkglibdir=3DDIR use images from directory DIR instead of ${pkg= libdir} --grub-mkimage=3DFILE use FILE as grub-mkimage --image-type=3DTYPE select floppy or cdrom (default) @@ -71,7 +72,7 @@ --modules=3D*) modules=3D`echo "$option" | sed 's/--modules=3D//'` ;; --overlay=3D*) - overlay=3D`echo "$option" | sed 's/--overlay=3D//'` ;; + overlay=3D${overlay}${overlay:+ }`echo "$option" | sed 's/--overlay=3D//'= ` ;; --pkglibdir=3D*) input_dir=3D`echo "$option" | sed 's/--pkglibdir=3D//'` ;; --grub-mkimage=3D*) @@ -124,9 +125,10 @@ echo "insmod $i" done > ${aux_dir}/boot/grub/grub.cfg =20 -if test "x$overlay" =3D x ; then : ; else - cp -dpR ${overlay}/* ${aux_dir}/ -fi +for d in ${overlay}; do + echo "Overlaying $d" + cp -dpR "${d}"/* "${aux_dir}"/ +done =20 if [ "x${image_type}" =3D xfloppy -o "x${emulation}" =3D xfloppy ] ; then # build memdisk --MP_/YAXIfjrosztTx2CfANCXIEg-- --Sig_/AJkZ8oJpZP5KVezc7oM_3IV Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAki6wc8ACgkQokx8fzcGbYfWTACfaZTm761u30ylqiXWz9iGiEb9 CIQAn3VSYb8XlV/1J2zsFg095eY2NepJ =2i01 -----END PGP SIGNATURE----- --Sig_/AJkZ8oJpZP5KVezc7oM_3IV--