From d38e100227a7264ff53802d88805f3bc274d1530 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pj@pehjota.net>
Date: Sun, 09 Nov 2014 22:43:00 -0500
Subject: /etc/lilo.conf.in: Use branding, add menu entries

Two things happened in the menu entries:

 1. With the ProteanOS logo in the background image, we don't need
    "ProteanOS 1.0" in the menu entry labels.  This gives us back
    characters that we can use to better describe the options, instead
    of using obscure "~" and "+" symbols for "Old kernel" and
    "Large font", respectively.
 2. Two possible roots (sda1 and sdb1) are now hardcoded.  They can be
    selected at boot time.  This obviates an install-time question about
    what the root will be called on the running system.  There are now
    twice as many menu entries.
---
(limited to 'src')

diff --git a/src/run/lilo/etc/lilo.conf.in b/src/run/lilo/etc/lilo.conf.in
index 5a8f7ca..baebf0c 100644
--- a/src/run/lilo/etc/lilo.conf.in
+++ b/src/run/lilo/etc/lilo.conf.in
@@ -1,6 +1,9 @@
 boot = @BOOT@
 prompt
-bitmap = /boot/tuxlogo.bmp
+bitmap = /boot/proteanos.bmp
+bmp-table = 55,8,1,16,
+bmp-colors = 0,,,1,,
+bmp-timer = none
 timeout = 50
 lba32
 compact
@@ -8,16 +11,31 @@ verbose = 1
 vga = normal
 
 image = /boot/vmlinuz
-	label = "ProteanOS 1.0"
+	label = "sda1 Default"
 	read-write
-	append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
+	append = "root=/dev/sda1 fbcon=font:MPLUS_1M_REGULAR_11x22"
 
 image = /boot/vmlinuz.old
-	label = "ProteanOS 1.0 ~"
+	label = "sda1 Old kernel"
 	read-write
-	append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
+	append = "root=/dev/sda1 fbcon=font:MPLUS_1M_REGULAR_11x22"
 
 image = /boot/vmlinuz
-	label = "ProteanOS 1.0 +"
+	label = "sda1 Large font"
 	read-write
-	append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_16x32"
+	append = "root=/dev/sda1 fbcon=font:MPLUS_1M_REGULAR_16x32"
+
+image = /boot/vmlinuz
+	label = "sdb1 Default"
+	read-write
+	append = "root=/dev/sdb1 fbcon=font:MPLUS_1M_REGULAR_11x22"
+
+image = /boot/vmlinuz.old
+	label = "sdb1 Old kernel"
+	read-write
+	append = "root=/dev/sdb1 fbcon=font:MPLUS_1M_REGULAR_11x22"
+
+image = /boot/vmlinuz
+	label = "sdb1 Large font"
+	read-write
+	append = "root=/dev/sdb1 fbcon=font:MPLUS_1M_REGULAR_16x32"
--
cgit v0.9.1