[PATCH] 30_os-prober: add $onstr ot top level Linux entries too

[Andrey Borzenkov]

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 <address@hidden>

---
 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)