From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1KZiKT-0002OR-Un for mharc-grub-devel@gnu.org; Sun, 31 Aug 2008 04:30:38 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KZiKR-0002OD-EB for grub-devel@gnu.org; Sun, 31 Aug 2008 04:30:35 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KZiKO-0002Kl-EE for grub-devel@gnu.org; Sun, 31 Aug 2008 04:30:34 -0400 Received: from [199.232.76.173] (port=44228 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KZiKO-0002KV-2u for grub-devel@gnu.org; Sun, 31 Aug 2008 04:30:32 -0400 Received: from gateway05.websitewelcome.com ([67.18.125.8]:48763) by monty-python.gnu.org with smtp (Exim 4.60) (envelope-from ) id 1KZiKN-000610-Kk for grub-devel@gnu.org; Sun, 31 Aug 2008 04:30:31 -0400 Received: (qmail 12716 invoked from network); 31 Aug 2008 06:55:30 -0000 Received: from gator297.hostgator.com (74.53.228.114) by gateway05.websitewelcome.com with SMTP; 31 Aug 2008 06:55:30 -0000 Received: from c-67-185-142-228.hsd1.wa.comcast.net ([67.185.142.228]:48784 helo=gamma.lan) by gator297.hostgator.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.68) (envelope-from ) id 1KZgf4-0004vF-45 for grub-devel@gnu.org; Sun, 31 Aug 2008 01:43:46 -0500 Date: Sat, 30 Aug 2008 23:43:41 -0700 From: Colin D Bennett To: grub-devel@gnu.org Message-ID: <20080830234341.662e6132@gamma.lan> 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_/j8ss2+m5AiAfLZOO/_g3tZu"; 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 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 08:30:35 -0000 --Sig_/j8ss2+m5AiAfLZOO/_g3tZu Content-Type: multipart/mixed; boundary="MP_//KDD3vKbzs/dfW.X0SVbxOc" --MP_//KDD3vKbzs/dfW.X0SVbxOc Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline 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 --MP_//KDD3vKbzs/dfW.X0SVbxOc 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_//KDD3vKbzs/dfW.X0SVbxOc 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-30 18:33:46 +0000 @@ -71,7 +71,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 +124,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_//KDD3vKbzs/dfW.X0SVbxOc-- --Sig_/j8ss2+m5AiAfLZOO/_g3tZu Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) iEYEARECAAYFAki6PaQACgkQokx8fzcGbYdg5wCfbDqo1c74Dz1IRcgh3+sZKHqd M20An09mezHx2iFRU7zVj/Qar/x5/wks =bYuW -----END PGP SIGNATURE----- --Sig_/j8ss2+m5AiAfLZOO/_g3tZu--