summaryrefslogtreecommitdiffstats
path: root/src/run/lilo/etc
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-11-10 20:30:25 (EST)
committer P. J. McDermott <pj@pehjota.net>2014-11-10 20:30:25 (EST)
commit53cb849f8c7b5b5c2ed7be7a8503fcc9e085e425 (patch)
treed1876fba4b1ac557d92a71fcc981de46924cc442 /src/run/lilo/etc
parentd38e100227a7264ff53802d88805f3bc274d1530 (diff)
/etc/lilo.conf.in: Revert root= hardcoding
We'll use root=PARTUUID= with MBR disk signatures, which Linux supports since version 3.8 (commit d33b98f).
Diffstat (limited to 'src/run/lilo/etc')
-rw-r--r--src/run/lilo/etc/lilo.conf.in27
1 files changed, 6 insertions, 21 deletions
diff --git a/src/run/lilo/etc/lilo.conf.in b/src/run/lilo/etc/lilo.conf.in
index baebf0c..5e8b5dc 100644
--- a/src/run/lilo/etc/lilo.conf.in
+++ b/src/run/lilo/etc/lilo.conf.in
@@ -11,31 +11,16 @@ verbose = 1
vga = normal
image = /boot/vmlinuz
- label = "sda1 Default"
+ label = "Default"
read-write
- append = "root=/dev/sda1 fbcon=font:MPLUS_1M_REGULAR_11x22"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
image = /boot/vmlinuz.old
- label = "sda1 Old kernel"
+ label = "Old kernel"
read-write
- append = "root=/dev/sda1 fbcon=font:MPLUS_1M_REGULAR_11x22"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_11x22"
image = /boot/vmlinuz
- label = "sda1 Large font"
+ label = "Large font"
read-write
- 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"
+ append = "root=@ROOT@ fbcon=font:MPLUS_1M_REGULAR_16x32"