Adds main menu title and diagnostic tools submenu generation

bin/lwr

@@ -272,10 +272,13 @@ class LiveWrapper(cliapp.Application):
             bootconfig.add_live()
         if self.settings['installer']:
             bootconfig.add_installer(self.kernel_path, self.ramdisk_path)
-        if self.settings['memtest']:
-            bootconfig.add_memtest()
-        if self.settings['hdt']:
-            bootconfig.add_hdt()
+        if self.settings['memtest'] or self.settings['hdt']:
+            diagconfig = BootloaderConfig(self.cdroot.path)
+            if self.settings['memtest']:
+                diagconfig.add_memtest()
+            if self.settings['hdt']:
+                diagconfig.add_hdt()
+            bootconfig.add_submenu("Diagnostic Tools", diagconfig)
 
         print(repr(bootconfig.entries))
 

lwr/isolinux.py

@@ -31,11 +31,10 @@ def generate_cfg(bootconfig, submenu=False):
     ret = str()
     if not submenu:
         first = True
-        # ADD TITLE "Main Boot Menu"
-        ret += "UI vesamenu.c32\n"
+        ret += "INCLUDE stdmenu.cfg\n"
+        ret += "MENU title Main Menu\n"
     else:
         first = False
-    ret += "INCLUDE stdmenu.cfg\n"
      
     for entry in bootconfig.entries:
         label = "%s" % (entry['description'],)