host examination: bootloader: edit all grub2 menu entries

edit all the menuentry and submenu entries.

This is a good idea because in princple the first menu and submenu
entries in the autogenerated grub.cfg might be in a function which is
not actually called.

The resulting grub menu now looks even sillier.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ts-examine-serial-pre b/ts-examine-serial-pre
index 86f332f61479e2d1257fd5230aaad7bb62d7c077..90037c6a36b1890801466c1a59114929b397029c 100755 (executable)
--- a/ts-examine-serial-pre
+++ b/ts-examine-serial-pre
@@ -80,12 +80,9 @@ sub bootloader () {
     } else {
        # no support for grub1
        $edit->('/boot/grub/grub.cfg', sub {
-            my %done;
             while (<::EI>) {
-               s{^(\s* ( menuentry | submenu ) \s+
-                     (['"]) )( [^'"]+ \3) }{
-                    $done{$2}++ ? $& : "$1$c $4"
-                }xe;
+               s{^(\s* (?: menuentry | submenu ) \s+
+                     (['"]) )( [^'"]+ \2) }{$1$c $3}x;
                print ::EO;
            }
        });