From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UOYxj-0002bU-MO for mharc-grub-devel@gnu.org; Sat, 06 Apr 2013 15:39:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOYxb-0002aD-7f for grub-devel@gnu.org; Sat, 06 Apr 2013 15:39:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UOYxU-0007TI-Qk for grub-devel@gnu.org; Sat, 06 Apr 2013 15:39:35 -0400 Received: from mail-ea0-x22d.google.com ([2a00:1450:4013:c01::22d]:43691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UOYxU-0007T3-KZ for grub-devel@gnu.org; Sat, 06 Apr 2013 15:39:28 -0400 Received: by mail-ea0-f173.google.com with SMTP id k11so1793209eaj.32 for ; Sat, 06 Apr 2013 12:39:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:x-enigmail-version:content-type; bh=ajDk3xw9nv0ucJIlNDXM3Iy1U6Hd8tXPTrLC0MtMV1M=; b=im6qYSF8aU7VqDUDN9s6q3CBKLDPZHs2h7ft+oTq9uL1XWHVB/440WZfYXtRDzrc9y s/eELlorjuMZc0LeKTJA7uOvychuYVA6nUXUw1/06sLb8YOtS3RF1rKRgCSKc7ofaiOW /D1Nol1MO8e95SRC0bCqT0soe7ZTiB50PqQsPu4UW4FyjoTlJGaPmlKxLnKEckcKoC/p muDGXq7Jbug3fDH3UXkgyV4LZ9P/NFiPKLl7DhfpOQ3f7lemKHJUewCWDk131jALENHN m/96dVAwJ8cnZ7aAgHEc6C3+4VJYm2VTTJzwfwrWRZrtiLyDEzbztn+54ydgCXCqUzUG 0CHQ== X-Received: by 10.14.1.130 with SMTP id 2mr32177930eed.15.1365277167165; Sat, 06 Apr 2013 12:39:27 -0700 (PDT) Received: from debian.x201.phnet (245-188.1-85.cust.bluewin.ch. [85.1.188.245]) by mx.google.com with ESMTPS id bc1sm22576362eeb.11.2013.04.06.12.39.26 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 06 Apr 2013 12:39:26 -0700 (PDT) Message-ID: <516079EC.50609@gmail.com> Date: Sat, 06 Apr 2013 21:39:24 +0200 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130116 Icedove/10.0.12 MIME-Version: 1.0 To: The development of GNU GRUB Subject: Re: [PATCH] 30_os-prober: add $onstr ot top level Linux entries too References: <1365147045-4958-1-git-send-email-arvidjaar@gmail.com> In-Reply-To: <1365147045-4958-1-git-send-email-arvidjaar@gmail.com> X-Enigmail-Version: 1.4.1 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enigE97A1E9F7832517CC143910B" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22d X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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: Sat, 06 Apr 2013 19:39:42 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigE97A1E9F7832517CC143910B Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 05.04.2013 09:30, Andrey Borzenkov wrote: > This fixes two issues >=20 > 1. It visually distinguishes between multiple installations of the > same OS version. Currently all of them get identical titles. >=20 I don't know how "speaking" the device names are in practice. They are not stable and what is sda1 under one install can be sdb1 under another one. Perhaps we should use some other kind of identifier for this. > 2. linux prober is using "(on /dev/xxx)" as indication that entry has > to be skipped. Top level entries should be skipped too. This is improper. This string can be translated and e.g. '(=D0=BD=D0=B0 /= dev/xxx)' or '(auf /dev/xxx)' won't match '(on /dev/xxx)'. "$menuentry_id_option 'osprober-" should be used instead (and (on ...) be kept in or-way for backward compatibility). >=20 > $onstr was already appended to all other generated Linux menu entries. >=20 > Signed-off-by: Andrey Borzenkov >=20 > --- > util/grub.d/30_os-prober.in | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in > index bf47dc3..4cd45e8 100644 > --- a/util/grub.d/30_os-prober.in > +++ b/util/grub.d/30_os-prober.in > @@ -186,7 +186,7 @@ EOF > =20 > if [ "x$is_first_entry" =3D xtrue ]; then > cat << EOF > -menuentry '$(echo "$OS" | grub_quote)' --class gnu-linux --class gnu -= -class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_id= ' { > +menuentry '$(echo "$OS $onstr" | grub_quote)' --class gnu-linux --clas= s gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_de= vice_id' { > EOF > save_default_entry | grub_add_tab > printf '%s\n' "${prepare_boot_cache}" > @@ -201,7 +201,7 @@ EOF > cat << EOF > } > EOF > - echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}"= | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-$boot_d= evice_id' {" > + echo "submenu '$(gettext_printf "Advanced options for %s" "${OS} = $onstr" | grub_quote)' \$menuentry_id_option 'osprober-gnulinux-advanced-= $boot_device_id' {" > is_first_entry=3Dfalse > fi > title=3D"${LLABEL} $onstr" --------------enigE97A1E9F7832517CC143910B 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.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iF4EAREKAAYFAlFgee0ACgkQNak7dOguQgnK2QEAmz4Y/jsRadmbxNjWiuY6L05C O+Selm2q4CchqibgYxUBAMRIQIU1a1MQ7rbtzKrVp5nb4EaiKxevT2qco7vL7c/h =TkPZ -----END PGP SIGNATURE----- --------------enigE97A1E9F7832517CC143910B--