From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JVYth-0006wI-Id for mharc-grub-devel@gnu.org; Sat, 01 Mar 2008 16:05:33 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JVYtf-0006vx-LG for grub-devel@gnu.org; Sat, 01 Mar 2008 16:05:31 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JVYtd-0006vi-3S for grub-devel@gnu.org; Sat, 01 Mar 2008 16:05:31 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JVYtd-0006vf-1N for grub-devel@gnu.org; Sat, 01 Mar 2008 16:05:29 -0500 Received: from mailout01.sul.t-online.de ([194.25.134.80] helo=mailout01.sul.t-online.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JVYtc-000158-9O for grub-devel@gnu.org; Sat, 01 Mar 2008 16:05:28 -0500 Received: from fwd30.aul.t-online.de by mailout01.sul.t-online.com with smtp id 1JVYtb-00053n-01; Sat, 01 Mar 2008 22:05:27 +0100 Received: from [10.3.2.2] (rAg4f8Z-8h9tED1z7vr+yF02TA4v75-OKqxpNhmIddjbJ-TIqos9cTBGOkJVjXigbE@[217.235.191.79]) by fwd30.aul.t-online.de with esmtp id 1JVYtW-1fvNzs0; Sat, 1 Mar 2008 22:05:22 +0100 Message-ID: <47C9C512.4090009@t-online.de> Date: Sat, 01 Mar 2008 22:05:22 +0100 From: Christian Franke User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.11) Gecko/20071128 SeaMonkey/1.1.7 MIME-Version: 1.0 To: The development of GRUB 2 References: <47ACA35C.6080803@t-online.de> <20080208231411.GC17287@thorin> <47ACE69B.7070101@t-online.de> <47ADDD07.3080203@t-online.de> <20080209215923.GA25086@thorin> <1202598270.2418.6.camel@dv> <47AEFF8C.6090505@t-online.de> <20080210151412.GA7404@thorin> <47B61311.90005@t-online.de> <20080217133107.GA15576@thorin> In-Reply-To: <20080217133107.GA15576@thorin> Content-Type: multipart/mixed; boundary="------------010901020705040703070409" X-ID: rAg4f8Z-8h9tED1z7vr+yF02TA4v75-OKqxpNhmIddjbJ-TIqos9cTBGOkJVjXigbE X-TOI-MSGID: 0b212d3f-e585-456d-849c-40293ddc71b9 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) Subject: Re: [PATCH] Create floppy emulation boot CD with grub-mkimage 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: Sat, 01 Mar 2008 21:05:31 -0000 This is a multi-part message in MIME format. --------------010901020705040703070409 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Robert Millan wrote: > On Fri, Feb 15, 2008 at 11:32:49PM +0100, Christian Franke wrote: > > ... > >> The patch also adds a --joliet option, useful to access the long file >> names on Windows (which has no RR support). >> > > Is there any drawback in using --joliet ? If not, I think it's better to do > it by default to avoid "option creep". > > Here a new version of the patch with Joliet enabled always. Should not break anything. Christian 2008-03-01 Christian Franke * util/i386/pc/grub-mkrescue.in: Add --emulation=floppy to create a floppy emulation boot CD when non emulation mode does not work. Enable Joliet CD filesystem extension. --------------010901020705040703070409 Content-Type: text/x-patch; name="grub2-mkrescue-emulation-2.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="grub2-mkrescue-emulation-2.patch" --- grub2.orig/util/i386/pc/grub-mkrescue.in 2008-02-09 14:02:56.057039500 +0100 +++ grub2/util/i386/pc/grub-mkrescue.in 2008-03-01 21:52:23.493466900 +0100 @@ -46,6 +46,7 @@ --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) + --emulation=TYPE select boot emulation type floppy or none (default) grub-mkimage generates a bootable rescue image of the specified type. @@ -56,6 +57,7 @@ image_type=cdrom input_dir=${pkglibdir} grub_mkimage=grub-mkimage +emulation=none # Check the arguments. for option in "$@"; do @@ -82,6 +84,14 @@ echo "Unknown image type \`$image_type'" 1>&2 exit 1 ;; esac ;; + --emulation=*) + emulation=`echo "$option" | sed 's/--emulation=//'` + case "$emulation" in + floppy|none) ;; + *) + echo "Unknown emulation type \`$emulation'" 1>&2 + exit 1 ;; + esac ;; -*) echo "Unrecognized option \`$option'" 1>&2 usage @@ -113,7 +123,7 @@ cp -dpR ${overlay}/* ${aux_dir}/ fi -if [ "x${image_type}" = "xfloppy" ] ; then +if [ "x${image_type}" = xfloppy -o "x${emulation}" = xfloppy ] ; then # build memdisk memdisk_img=`mktemp` tar -C ${aux_dir} -cf ${memdisk_img} boot @@ -125,8 +135,21 @@ rm -f ${memdisk_img} # build floppy image - cat ${input_dir}/boot.img ${core_img} /dev/zero | dd bs=1024 count=1440 > $output_image + if [ "x${image_type}" = xcdrom ] ; then + floppy_dir=`mktemp -d` + floppy_img=${floppy_dir}/grub_floppy.img + else + floppy_img=${output_image} + fi + cat ${input_dir}/boot.img ${core_img} /dev/zero | dd bs=1024 count=1440 > ${floppy_img} rm -f ${core_img} + + if [ "x${image_type}" = xcdrom ] ; then + # build iso image + genisoimage -b grub_floppy.img \ + -o ${output_image} -r -J ${floppy_dir} + rm -rf ${floppy_dir} + fi else # build core.img core_img=`mktemp` @@ -139,7 +162,7 @@ # build iso image genisoimage -b boot/grub/grub_eltorito \ -no-emul-boot -boot-load-size 4 -boot-info-table \ - -o ${output_image} -r ${aux_dir} + -o ${output_image} -r -J ${aux_dir} rm -rf ${aux_dir} fi --------------010901020705040703070409--