summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2021-01-15 20:37:28 (EST)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2021-01-15 20:37:28 (EST)
commit3155fcea6303fa7ca80a4bd66c0a674313951aec (patch)
tree5dbe31d8130fae04660c18c4b221a4edbd2bbbc2
parentbe70837de84444a46ff1e1d8a8e33cc284617fef (diff)
lilo: Boot straight to ramfs
-rw-r--r--changelog6
-rw-r--r--src/run/lilo/etc/lilo.conf.in15
-rw-r--r--substvars1
3 files changed, 7 insertions, 15 deletions
diff --git a/changelog b/changelog
index 76fd4c2..6670f74 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+config-libiquity-testbench (1.2) trunk
+
+ * config-lilo: Boot straight to the ramfs, without a menu.
+
+ -- Patrick McDermott <patrick.mcdermott@libiquity.com> Fri, 15 Jan 2021 20:37:12 -0500
+
config-libiquity-testbench (1.1) trunk
* config-busybox-libiquity-testbench: New upstream version.
diff --git a/src/run/lilo/etc/lilo.conf.in b/src/run/lilo/etc/lilo.conf.in
index 8c7959d..b22dbfa 100644
--- a/src/run/lilo/etc/lilo.conf.in
+++ b/src/run/lilo/etc/lilo.conf.in
@@ -1,21 +1,8 @@
boot = @BOOT@
-prompt
-bitmap = /boot/proteanos.bmp
-bmp-table = 55,8,1,16,
-bmp-colors = 0,,,1,,
-bmp-timer = none
-timeout = 50
lba32
compact
verbose = 1
vga = normal
image = /boot/vmlinuz
- label = "Default"
- read-write
- append = "root=@ROOT@"
-
-image = /boot/vmlinuz.old
- label = "Old kernel"
- read-write
- append = "root=@ROOT@"
+initrd = /boot/initrd.img
diff --git a/substvars b/substvars
index f06d5a0..22f7c55 100644
--- a/substvars
+++ b/substvars
@@ -11,4 +11,3 @@ Config-Base-Depends:
stress,
sensors,
smartctl,
-Config-lilo-Depends: proteanos-branding-lilo