summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-07-21 20:08:17 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-07-21 20:09:13 (EDT)
commit49483ed621d57063e155c8b709141cc13d57b943 (patch)
tree541ce41eec7d2711a1008baa35e0564c8d00052e
parentfa8e17629144712033123def1e3dea9afb2c09c7 (diff)
lilo: Move root option into append
LILO tries to stat() the specified root device. If that fails, LILO expects that the given root option is numeric. If something like "/dev/sdb1" is given on a system with no "/dev/sdb1" device node, LILO throws an error: "Fatal: Illegal 'root=' specification: /dev/sdb1". This all happens in dev_number() in src/bsect.c.
-rw-r--r--src/run/lilo/etc/lilo.conf.in9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/run/lilo/etc/lilo.conf.in b/src/run/lilo/etc/lilo.conf.in
index d8ff7b4..5a8f7ca 100644
--- a/src/run/lilo/etc/lilo.conf.in
+++ b/src/run/lilo/etc/lilo.conf.in
@@ -9,18 +9,15 @@ vga = normal
image = /boot/vmlinuz
label = "ProteanOS 1.0"
- root = @ROOT@
read-write
- append = "fbcon=font:MPLUS_1M_REGULAR_11x22"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
image = /boot/vmlinuz.old
label = "ProteanOS 1.0 ~"
- root = @ROOT@
read-write
- append = "fbcon=font:MPLUS_1M_REGULAR_11x22"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
image = /boot/vmlinuz
label = "ProteanOS 1.0 +"
- root = @ROOT@
read-write
- append = "fbcon=font:MPLUS_1M_REGULAR_16x32"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_16x32"