Commits

Moises Henriquez  committed 6076df9

Debugging bootloader TUI and disabled bootsplash entries

  • Participants
  • Parent commits 62290d5

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,
+#            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))
             self.buffer.append("%s read-only" % tab)
             self.buffer.append("# --")

File vinstall/controller/bootloader.py

 	    return
 	else:
 	    # Disable the bootsplash by renaming the initrd.
-	    if not os.path.exists(os.path.join(ramdiskdir,'initrd.gz'):
+	    if not os.path.exists(os.path.join(ramdiskdir,'initrd.gz')):
 	        LOG.error("User selected to disable bootsplash, but no initrd was found in target")
 		return
 	    LOG.debug("Renaming initrd.gz to disable bootsplash animation per user's request")
 	# 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 = "/boot/vmlinuz"
-	tui.root = self.config["target_device"]
+	tui.root = rootpart.path()
 	tui.type = "linux"
+	tui.initrd = None
 	tui.label = "Linux-tui"
-	tui.appendline = 'append="root=%s ro vga=normal 2"'% self.config['target_device']
+	tui.appendline = 'root=%s ro vga=normal 2'% tui.root
 	lilo.add_os(tui)