From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1Q2NP0-0001df-SL for mharc-grub-devel@gnu.org; Wed, 23 Mar 2011 08:43:07 -0400 Received: from [140.186.70.92] (port=34619 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q2NOw-0001a1-Ch for grub-devel@gnu.org; Wed, 23 Mar 2011 08:43:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q2NOt-0002kl-TM for grub-devel@gnu.org; Wed, 23 Mar 2011 08:43:00 -0400 Received: from mail-ew0-f41.google.com ([209.85.215.41]:46488) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q2NOt-0002kZ-Hf for grub-devel@gnu.org; Wed, 23 Mar 2011 08:42:59 -0400 Received: by ewy9 with SMTP id 9so2235097ewy.0 for ; Wed, 23 Mar 2011 05:42:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:x-enigmail-version:content-type; bh=qM0oxhrlznM06zNX/aGPvHls52CFko5FUDD2MejV4ow=; b=vkt/Ll08ofGahwK/v5+3kzfXFTLrcEhjI4sYe35ujeMfoOySKk2jcsGg6suBHXnui+ m1Oz7mGYCpbrpK0uIlWCx+e4WSbYZFfRjKAg/AuLDHVuXcb8kQasJk+DHSI3D07tjXZG I7uqHL7Pg7ryrDFIzFUAlfZ41N1YvSZxZGu3Y= 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=TUz4TF5yPGpmdYA9E0slG63jvQHrecroVZ5SA/uWUjToBwD90W0fHCvwGoEDAPqgta Vqg37T/qpRmOw1t9OyRghG87JrRbhhU1Dg4brlkbTuI3z4IhUljiXPv/xtCwCjaSjoej XMbPEhu8ywwI7PTlADHKzep2lgoPJckZXvdh4= Received: by 10.14.121.9 with SMTP id q9mr2372334eeh.102.1300884178662; Wed, 23 Mar 2011 05:42:58 -0700 (PDT) Received: from debian.x201.phnet (etx-public-dock-248-dhcp.ethz.ch [82.130.81.248]) by mx.google.com with ESMTPS id x54sm3621266eeh.19.2011.03.23.05.42.57 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 23 Mar 2011 05:42:57 -0700 (PDT) Message-ID: <4D89EAD0.20006@gmail.com> Date: Wed, 23 Mar 2011 13:42:56 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.16) Gecko/20110303 Iceowl/1.0b1 Icedove/3.0.11 MIME-Version: 1.0 To: The development of GNU GRUB References: <19831.45049.172606.321868@mariner.uk.xensource.com> <20110309174840.GN31494@riva.ucam.org> In-Reply-To: <20110309174840.GN31494@riva.ucam.org> X-Enigmail-Version: 1.0.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig33B8457C6349171856D43CE4" X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.215.41 Subject: Re: Bug#617538: update-grub (mk-grubconfig) does not support old "xenkopt" 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: Wed, 23 Mar 2011 12:43:04 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig33B8457C6349171856D43CE4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable The patch is ok after 1.99. On 09.03.2011 18:48, Colin Watson wrote: > On Wed, Mar 09, 2011 at 04:51:05PM +0000, Ian Jackson wrote: > =20 >> The grub 2 config generator does not appear to support an equivalent >> to the "xenkopt" option from old (grub 1) update-grub. >> >> This is used to provide kernel command line arguments that apply only >> when booting the kernel under Xen. For example, a pvops kernel which >> can boot dom0 vs. baremetal, and where a serial console is in use, >> would normally want >> kopt=3D"console=3DttyS0,115200,8n1" >> xenkopt=3D"console=3Dhvc0" >> since when booting under Xen the kernel needs to use the Xen console >> rather than direct access to the serial port. >> >> I suggest adding two variables >> GRUB_CMDLINE_LINUX_XEN >> GRUB_CMDLINE_LINUX_XEN_DEFAULT >> which when specified /override/ the values of >> GRUB_CMDLINE_LINUX >> GRUB_CMDLINE_LINUX_DEFAULT >> =20 > Seems reasonable, although I think the naming is confusing; it's not > necessarily obvious that GRUB_CMDLINE_LINUX_XEN overrides > GRUB_CMDLINE_LINUX while GRUB_CMDLINE_XEN appends to it. How about > GRUB_CMDLINE_LINUX_XEN_REPLACE and > GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT? They're a bit long, but ... > > (CCing patch to grub-devel.) > > 2011-03-09 Colin Watson > > * util/grub.d/20_linux_xen.in: Honour GRUB_CMDLINE_LINUX_XEN_REPLACE > and GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT, which replace > GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT (complementing the > existing options which append). > * docs/grub.texi (Simple configuration): Document new options. > > =3D=3D=3D modified file 'docs/grub.texi' > --- docs/grub.texi 2011-03-09 17:35:16 +0000 > +++ docs/grub.texi 2011-03-09 17:46:20 +0000 > @@ -1114,8 +1114,14 @@ NetBSD. > =20 > @item GRUB_CMDLINE_XEN > @itemx GRUB_CMDLINE_XEN_DEFAULT > -As @samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT}, bu= t for > -Linux and Xen. > +The values of these options are appended to the values of > +@samp{GRUB_CMDLINE_LINUX} and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Li= nux > +and Xen menu entries. > + > +@item GRUB_CMDLINE_LINUX_XEN_REPLACE > +@item GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT > +The values of these options replace the values of @samp{GRUB_CMDLINE_L= INUX} > +and @samp{GRUB_CMDLINE_LINUX_DEFAULT} for Linux and Xen menu entries. > =20 > @item GRUB_DISABLE_LINUX_UUID > Normally, @command{grub-mkconfig} will generate menu entries that use > > =3D=3D=3D modified file 'util/grub.d/20_linux_xen.in' > --- util/grub.d/20_linux_xen.in 2011-02-11 13:00:54 +0000 > +++ util/grub.d/20_linux_xen.in 2011-03-09 17:44:27 +0000 > @@ -51,6 +51,14 @@ else > LINUX_ROOT_DEVICE=3DUUID=3D${GRUB_DEVICE_UUID} > fi > =20 > +# Allow overriding GRUB_CMDLINE_LINUX and GRUB_CMDLINE_LINUX_DEFAULT. > +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE}" ]; then > + GRUB_CMDLINE_LINUX=3D"${GRUB_CMDLINE_LINUX_XEN_REPLACE}" > +fi > +if [ "${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT}" ]; then > + GRUB_CMDLINE_LINUX_DEFAULT=3D"${GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAU= LT}" > +fi > + > linux_entry () > { > os=3D"$1" > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig33B8457C6349171856D43CE4 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.11 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAk2J6tAACgkQNak7dOguQgljTAD+Ol7LcvIDzOYL0HCfJOq6iapS e+3qXpeA3AN7g6uV0YgA/1j+2Mdi3z1S7/ytsiEmih4Xx61/j42zoBsEOmFu0Pke =hu06 -----END PGP SIGNATURE----- --------------enig33B8457C6349171856D43CE4--