Commits

Moises Henriquez  committed b6bd12b

Debug bootsplash disable procedure for lilo entries

  • Participants
  • Parent commits ef102f5

Comments (0)

Files changed (2)

File vinstall/backend/bootloader.py

             if system.initrd:
                 self.buffer.append("%s initrd = %s" % (tab,
                     system.initrd))
-            if system.appendline:
-                if "splash" not in system.appendline:
-                    self.buffer.append('%s append = "%s splash quiet"' %
-                            (tab, system.appendline))
-                else:
-                    self.buffer.append('%s append = "%s"' % (tab,
-                            system.appendline))
+#            if system.appendline:
+#                if "splash" not in system.appendline:
+#                    self.buffer.append('%s append = "%s splash quiet"' %
+#                            (tab, system.appendline))
+#                else:
+#                    self.buffer.append('%s append = "%s"' % (tab,
+#                            system.appendline))
+	    if system.appendline:
+	        self.buffer.append('%s append = "%s"'% (tab, system.appendline)
             self.buffer.append("%s read-only" % tab)
             self.buffer.append("# --")
 

File vinstall/controller/bootloader.py

         lilo = bootloader.Lilo(target)
         for system in bootloader.OperatingSystem.all():
 	    LOG.debug("Adding %s entry to LiLo boot menu"% system.label)
+	    if system.root == self.config['target_device'].path():
+	        # Set grab the values for the tui entry here.
+	        tui_label = system.label
+   	        tui_kernel = system.kernel
 	    if splash_opt: # Splash was disabled... override the initd line for the entry
 	        if system.root == self.config['target_device'].path():
 		    system.initrd = None
-		    tui_label = system.label
-		    tui_kernel = system.kernel
-            lilo.add_os(system)
+		    system.appendline = "root=%s verbose"% system.root
+		else:
+		    system.appendline = "root=%s splash quiet"% system.root
+                lilo.add_os(system)
 	# Create the TUI entry for LiLO
 	LOG.debug("Adding Linux-tui entry to LiLO boot menu")
 	tui = bootloader.OperatingSystem()
 	rootpart = self.config['target_device']
-	tui.kernel = tui_label
+	tui.kernel = tui_kernel
 	tui.root = rootpart.path()
 	tui.type = "linux"
 	tui.initrd = None
 	tui.label = "%s-tui"%tui_label
-	tui.appendline = 'root=%s ro 2'% tui.root
+	tui.appendline = 'root=%s ro 2 verbose'% tui.root
 	lilo.add_os(tui)