summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-11-09 22:43:00 (EST)
committer P. J. McDermott <pj@pehjota.net>2014-11-09 22:43:00 (EST)
commitd38e100227a7264ff53802d88805f3bc274d1530 (patch)
tree50aa8f3888fd0661c7cf598e659fb93ab3193b56
parent41d533e8a1d956f6295bb6f0574a1c844eef75a1 (diff)
/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.
-rw-r--r--src/run/lilo/etc/lilo.conf.in32
1 files changed, 25 insertions, 7 deletions
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"