From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1JXjzg-00069K-Do for mharc-grub-devel@gnu.org; Fri, 07 Mar 2008 16:20:44 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JXjzf-00068I-1P for grub-devel@gnu.org; Fri, 07 Mar 2008 16:20:43 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JXjzc-00067D-GH for grub-devel@gnu.org; Fri, 07 Mar 2008 16:20:42 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JXjzc-000677-Cv for grub-devel@gnu.org; Fri, 07 Mar 2008 16:20:40 -0500 Received: from mailout02.sul.t-online.de ([194.25.134.17] helo=mailout02.sul.t-online.com) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JXjzb-0001Wv-QB for grub-devel@gnu.org; Fri, 07 Mar 2008 16:20:40 -0500 Received: from fwd28.aul.t-online.de by mailout02.sul.t-online.com with smtp id 1JXjza-00021u-02; Fri, 07 Mar 2008 22:20:38 +0100 Received: from [10.3.2.2] (Z4tR+8Za8hvoHup5PI0csJzwq672KTLeJL-zThiSMUkSxquyJ0JNQcqTY+0T3RHg+8@[217.235.188.78]) by fwd28.aul.t-online.de with esmtp id 1JXjzI-0KDdy40; Fri, 7 Mar 2008 22:20:20 +0100 Message-ID: <47D1B199.5000703@t-online.de> Date: Fri, 07 Mar 2008 22:20:25 +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: <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> <47C9C512.4090009@t-online.de> <20080303204619.GA22431@thorin> <47CC7757.9070103@t-online.de> <20080303222414.GF22431@thorin> In-Reply-To: <20080303222414.GF22431@thorin> Content-Type: multipart/mixed; boundary="------------030304020007020201010608" X-ID: Z4tR+8Za8hvoHup5PI0csJzwq672KTLeJL-zThiSMUkSxquyJ0JNQcqTY+0T3RHg+8 X-TOI-MSGID: b1e0ce6a-1339-4d1f-a09e-b3fc29ef9a2a 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: Fri, 07 Mar 2008 21:20:43 -0000 This is a multi-part message in MIME format. --------------030304020007020201010608 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Robert Millan wrote: > ... >>> Uhm maybe it'd be better to mention what the emulation is for. As it is, >>> user >>> might wonder what is the appropiate --emulation value for >>> --image-type=floppy, >>> or even why --emulation=floppy doesn't produce floppy images. >>> >>> What do you think? >>> >>> >>> >> OK, e.g. >> >> . --emulation=TYPE select El Torito boot emulation type floppy >> . or none (default) (cdrom only) >> >> >> Or with the help syntax used by the grub binaries: >> >> . --emulation=(floppy|none) select El Torito boot emulation type (cdrom >> only) >> . [default=none] >> > > I don't mind either way. Anyone else does? > > A new version of the patch is attached. One might decide to unify bin<>sh help syntax later. Christian 2008-03-07 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. --------------030304020007020201010608 Content-Type: text/x-patch; name="grub2-mkrescue-emulation-3.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="grub2-mkrescue-emulation-3.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-07 21:20:43.046875000 +0100 @@ -46,6 +46,8 @@ Make GRUB rescue image. --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 El Torito boot emulation type floppy + or none (default) (cdrom only) grub-mkimage generates a bootable rescue image of the specified type. @@ -56,6 +58,7 @@ EOF image_type=cdrom input_dir=${pkglibdir} grub_mkimage=grub-mkimage +emulation=none # Check the arguments. for option in "$@"; do @@ -82,6 +85,14 @@ for option in "$@"; do 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 +124,7 @@ if test "x$overlay" = x ; then : ; else 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 +136,21 @@ if [ "x${image_type}" = "xfloppy" ] ; th 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 +163,7 @@ else # 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 --------------030304020007020201010608--