From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UQ3HH-0005QH-V5 for mharc-grub-devel@gnu.org; Wed, 10 Apr 2013 18:14:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54277) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3HE-0005MD-Eb for grub-devel@gnu.org; Wed, 10 Apr 2013 18:14:02 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQ3HD-0005TZ-Eg for grub-devel@gnu.org; Wed, 10 Apr 2013 18:14:00 -0400 Received: from mail-ea0-x22f.google.com ([2a00:1450:4013:c01::22f]:56151) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQ3HD-0005TU-84 for grub-devel@gnu.org; Wed, 10 Apr 2013 18:13:59 -0400 Received: by mail-ea0-f175.google.com with SMTP id r16so450559ead.20 for ; Wed, 10 Apr 2013 15:13:58 -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=/BjUyGPL+wqtmp6epIiDzuHMNwtg7MrDrsYM4/cx8SM=; b=xqmbLuKj6zVmWI5P61E0ZtmP1qRgIDC3htVfzExmIKLbIjfvj4E/D+GNxwLM51ZlCZ 2C58G9jhTBFp2f84kOJsLddQvme08fJ4px/+12IqZrs+gTe/qLLOqslG8m5+UI9810Mt evtu1P+RDvXlRstVKtxElG4VrwAJeRuDENgW3bhs17jMSr7S7jp9q3y8vhEiXnsevmeK FovAxONNpzVt/QXT2IaaCZWdAJjHMpjFaEwAhkiBiz4FGAU2XIy2z/PRu+gDoLYZao+9 bZ/LaCfaiVxOK71MO7DwPXmx2l4zIOUpY+azoGSR8G8b8Awa0TbWL1X0jjjLbNp6Pxzc WRcQ== X-Received: by 10.15.94.200 with SMTP id bb48mr9971589eeb.21.1365632037936; Wed, 10 Apr 2013 15:13:57 -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 u44sm2273681eel.7.2013.04.10.15.13.56 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 10 Apr 2013 15:13:56 -0700 (PDT) Message-ID: <5165E423.3000802@gmail.com> Date: Thu, 11 Apr 2013 00:13:55 +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="------------enigE62A9D2AE56CD6D2C2CF4B26" X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4013:c01::22f 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: Wed, 10 Apr 2013 22:14:02 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigE62A9D2AE56CD6D2C2CF4B26 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. Go ahead >=20 > 2. linux prober is using "(on /dev/xxx)" as indication that entry has > to be skipped. Top level entries should be skipped too. >=20 This part still should be fixed in os-prober > $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" --------------enigE62A9D2AE56CD6D2C2CF4B26 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/ iF4EAREKAAYFAlFl5CMACgkQNak7dOguQgm4BwD+NlVe/rDWQ+Bn9PfdTFieGnij cBJ3E/AjLyElzAreHJ0BAL2OOI6OH5YPM8qPA7HWhcK5ZxzY+fiDmr32wOs1R+El =M9Xn -----END PGP SIGNATURE----- --------------enigE62A9D2AE56CD6D2C2CF4B26--