From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UO173-0001r7-AI for mharc-grub-devel@gnu.org; Fri, 05 Apr 2013 03:31:05 -0400 Received: from eggs.gnu.org ([208.118.235.92]:46741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO16w-0001jZ-8I for grub-devel@gnu.org; Fri, 05 Apr 2013 03:31:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UO16p-0001L3-JK for grub-devel@gnu.org; Fri, 05 Apr 2013 03:30:58 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:46982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UO16p-0001Ko-88 for grub-devel@gnu.org; Fri, 05 Apr 2013 03:30:51 -0400 Received: by mail-lb0-f178.google.com with SMTP id q13so3474326lbi.37 for ; Fri, 05 Apr 2013 00:30:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=0JoEJ8c6yj4Jf4duA6qngcNsnQBKmqAlNcdlMNLI43w=; b=ueEJhPxbcakfVzXHP7IUmqANqD/Kfn2fUEP48SmVtaO/mDcQc08LEl6N0WARxt++ap MclcG53y1t5M798IJf3heWt0wP9MpdXTIGKFCifnGnNTCj8dlqdbJMDC0RVnc7yAYgt1 aFAvv/Sta/d0S6rkCO/Dso8rcJsGtrLkBm/93YGkmvr1FgsJ+b6SJwKfUA1E/jPu8lfy ZEUCHS2Rz0vE4cBAh8k1HZnKa5Pjvwv+WrgqLJ0gOW7kJ90dGy6u6XklJmen3A5DH2Uf ripbbj9/4ciGRsCI6wmYnF13jS6HucoekHCU3Eo3Y/TaQh5iy42H4gq1liQ8FnFSdtSG Lj8g== X-Received: by 10.112.143.10 with SMTP id sa10mr5327231lbb.36.1365147050247; Fri, 05 Apr 2013 00:30:50 -0700 (PDT) Received: from localhost.localdomain ([94.29.72.160]) by mx.google.com with ESMTPS id x9sm5016713lbi.15.2013.04.05.00.30.49 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 05 Apr 2013 00:30:49 -0700 (PDT) From: Andrey Borzenkov To: grub-devel@gnu.org Subject: [PATCH] 30_os-prober: add $onstr ot top level Linux entries too Date: Fri, 5 Apr 2013 11:30:45 +0400 Message-Id: <1365147045-4958-1-git-send-email-arvidjaar@gmail.com> X-Mailer: git-send-email 1.8.1.4 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.217.178 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: Fri, 05 Apr 2013 07:31:04 -0000 This fixes two issues 1. It visually distinguishes between multiple installations of the same OS version. Currently all of them get identical titles. 2. linux prober is using "(on /dev/xxx)" as indication that entry has to be skipped. Top level entries should be skipped too. $onstr was already appended to all other generated Linux menu entries. Signed-off-by: Andrey Borzenkov --- util/grub.d/30_os-prober.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 if [ "x$is_first_entry" = 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 --class gnu --class os \$menuentry_id_option 'osprober-gnulinux-simple-$boot_device_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_device_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=false fi title="${LLABEL} $onstr" -- tg: (f3399bf..) u/linux-onstr (depends on: master)