From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1OVvcr-0002Qz-NX for mharc-grub-devel@gnu.org; Mon, 05 Jul 2010 20:03:02 -0400 Received: from [140.186.70.92] (port=56155 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OVvcn-0002Qc-8k for grub-devel@gnu.org; Mon, 05 Jul 2010 20:02:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OVvcl-0005HD-KX for grub-devel@gnu.org; Mon, 05 Jul 2010 20:02:57 -0400 Received: from mail-bw0-f41.google.com ([209.85.214.41]:38735) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OVvcl-0005H1-9z for grub-devel@gnu.org; Mon, 05 Jul 2010 20:02:55 -0400 Received: by bwz9 with SMTP id 9so3912678bwz.0 for ; Mon, 05 Jul 2010 17:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=+MCMTuQElXLZlUfSqr44hGxhcWXFAnRl1tO//1+pSF4=; b=il0vLvLeLC052pg5pY2gotMG0gccSTQDxBJSiMxRdSaYv4mqvYxlqqwr4DfxVfqn9F +bTqpcL+xTKuX13wvv4CG/u4hQKE2ArLm+NR0hlP9ScAXw5YE3n4wgO2jSdg/jTa0FWC PD9jybIanaLP0sU8RbRjxp5EqeXpJregSTpP4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=DJm3Wf0CQh2pkKvrYVILMvzWEZPHH52eSVhwBSMvmr1MTicefmqlHfZ9Tb1hSuUYVP 5ifXmlkMAsUrnWWyY7JgpKMdySh/OUeAdy5uqp+umm0S5MrzpG2/U9WFnSNk+nsvpVDJ pr1BqzJyPAbIG6NIup0UTYLq0G+J23NLilUsY= Received: by 10.213.31.148 with SMTP id y20mr3111532ebc.9.1278374573961; Mon, 05 Jul 2010 17:02:53 -0700 (PDT) Received: from debian.bg45.phnet ([109.229.191.139]) by mx.google.com with ESMTPS id v59sm40563630eeh.4.2010.07.05.17.02.52 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 05 Jul 2010 17:02:52 -0700 (PDT) Message-ID: <4C3272AB.9070502@gmail.com> Date: Tue, 06 Jul 2010 02:02:51 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.10) Gecko/20100620 Icedove/3.0.5 MIME-Version: 1.0 To: grub-devel@gnu.org References: <20100705152444.GE21862@riva.ucam.org> <20100705170338.GA1368@riva.ucam.org> In-Reply-To: <20100705170338.GA1368@riva.ucam.org> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigAEAAE8E7DACE5A17EA1092B7" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: [PATCH] Call background_image after terminal_output gfxterm X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Jul 2010 00:02:59 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigAEAAE8E7DACE5A17EA1092B7 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 07/05/2010 07:03 PM, Colin Watson wrote: > On Mon, Jul 05, 2010 at 04:24:44PM +0100, Colin Watson wrote: > =20 >> 2010-07-05 Colin Watson >> >> * util/grub.d/00_header.in: Process GRUB_THEME and GRUB_BACKGROUND >> after setting gfxterm as the active terminal. GRUB_BACKGROUND >> doesn't work otherwise. >> =20 > Slight tweak to fix output indentation. > > =20 Go ahead for mainline. > =3D=3D=3D modified file 'util/grub.d/00_header.in' > --- util/grub.d/00_header.in 2010-06-29 15:20:49 +0000 > +++ util/grub.d/00_header.in 2010-07-05 16:57:28 +0000 > @@ -127,40 +127,74 @@ if loadfont `make_system_path_relative_t > set gfxmode=3D${GRUB_GFXMODE} > load_video > insmod gfxterm > +fi > EOF > +fi > + > +case x${GRUB_TERMINAL_INPUT} in > + x) > + # Just use the native terminal > + ;; > + x*) > + cat << EOF > +if terminal_input ${GRUB_TERMINAL_INPUT} ; then true ; else > + # For backward compatibility with versions of terminal.mod that don'= t > + # understand terminal_input > + terminal ${GRUB_TERMINAL_INPUT} > +fi > +EOF > + ;; > +esac > + > +case x${GRUB_TERMINAL_OUTPUT} in > + x) > + # Just use the native terminal > + ;; > + x*) > + cat << EOF > +if terminal_output ${GRUB_TERMINAL_OUTPUT} ; then true ; else > + # For backward compatibility with versions of terminal.mod that don'= t > + # understand terminal_output > + terminal ${GRUB_TERMINAL_OUTPUT} > +fi > +EOF > + ;; > +esac > + > +if [ "x$gfxterm" =3D x1 ]; then > if [ "x$GRUB_THEME" !=3D x ] && [ -f "$GRUB_THEME" ] \ > && is_path_readable_by_grub "$GRUB_THEME"; then > echo "Found theme: $GRUB_THEME" >&2 > - prepare_grub_to_access_device `${grub_probe} --target=3Ddevice "$GRUB= _THEME"` | sed -e "s/^/ /" > + prepare_grub_to_access_device `${grub_probe} --target=3Ddevice "$GRUB= _THEME"` > cat << EOF > - insmod gfxmenu > +insmod gfxmenu > EOF > themedir=3D"`dirname "$GRUB_THEME"`" > for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do > if [ -f "$x" ]; then > cat << EOF > - loadfont (\$root)`make_system_path_relative_to_its_root $x` > +loadfont (\$root)`make_system_path_relative_to_its_root $x` > EOF > fi > done > if [ x"`echo "$themedir"/*.jpg`" !=3D x"$themedir/*.jpg" ] || [ x"`ec= ho "$themedir"/*.jpeg`" !=3D x"$themedir/*.jpeg" ]; then > cat << EOF > - insmod jpeg > +insmod jpeg > EOF > fi > if [ x"`echo "$themedir"/*.png`" !=3D x"$themedir/*.png" ]; then > cat << EOF > - insmod png > +insmod png > EOF > fi > if [ x"`echo "$themedir"/*.tga`" !=3D x"$themedir/*.tga" ]; then > cat << EOF > - insmod tga > +insmod tga > EOF > fi > =20 > cat << EOF > - set theme=3D(\$root)`make_system_path_relative_to_its_root $GRUB_THE= ME` > +set theme=3D(\$root)`make_system_path_relative_to_its_root $GRUB_THEME= ` > EOF > elif [ "x$GRUB_BACKGROUND" !=3D x ] && [ -f "$GRUB_BACKGROUND" ] \= > && is_path_readable_by_grub "$GRUB_BACKGROUND"; then > @@ -171,47 +205,14 @@ EOF > *.jpg|*.jpeg) reader=3Djpeg ;; > *) echo "Unsupported image format" >&2; exit 1 ;; > esac > - prepare_grub_to_access_device `${grub_probe} --target=3Ddevice "$GRUB= _BACKGROUND"` | sed -e "s/^/ /" > + prepare_grub_to_access_device `${grub_probe} --target=3Ddevice "$GRUB= _BACKGROUND"` > cat << EOF > - insmod $reader > - background_image -m stretch `make_system_path_relative_to_its_root "= $GRUB_BACKGROUND"` > +insmod $reader > +background_image -m stretch `make_system_path_relative_to_its_root "$G= RUB_BACKGROUND"` > EOF > fi > - cat << EOF > -fi > -EOF > fi > =20 > -case x${GRUB_TERMINAL_INPUT} in > - x) > - # Just use the native terminal > - ;; > - x*) > - cat << EOF > -if terminal_input ${GRUB_TERMINAL_INPUT} ; then true ; else > - # For backward compatibility with versions of terminal.mod that don'= t > - # understand terminal_input > - terminal ${GRUB_TERMINAL_INPUT} > -fi > -EOF > - ;; > -esac > - > -case x${GRUB_TERMINAL_OUTPUT} in > - x) > - # Just use the native terminal > - ;; > - x*) > - cat << EOF > -if terminal_output ${GRUB_TERMINAL_OUTPUT} ; then true ; else > - # For backward compatibility with versions of terminal.mod that don'= t > - # understand terminal_output > - terminal ${GRUB_TERMINAL_OUTPUT} > -fi > -EOF > - ;; > -esac > - > # Gettext variables and module > if [ "x${LANG}" !=3D "xC" ] && [ -d "${locale_dir}" ] ; then > prepare_grub_to_access_device $(${grub_probe} --target=3Ddevice ${= locale_dir}) > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enigAEAAE8E7DACE5A17EA1092B7 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAkwycqwACgkQNak7dOguQgn/JQD+PdnQCNe/3y7svd/iMMBti0+V oPgEs2SGtWSB4e6VgpgA+wfRDv71uaBM0D8V3aAalHt6eUpK7FTj7+lc58bpjWqY =+oZf -----END PGP SIGNATURE----- --------------enigAEAAE8E7DACE5A17EA1092B7--