summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Bailey <jeffbailey@google.com>2014-01-26 00:48:24 +0000
committerJeremy Kerr <jk@ozlabs.org>2014-04-23 10:33:25 +0800
commit4caf65688fd16934235139cfa5e885a62f8f7370 (patch)
tree317aa74e81a3ac8d707eee9cfb25b3023bb8f4af
parent85421290c797c59320bf1e9f076f46195115ab92 (diff)
downloadtalos-petitboot-4caf65688fd16934235139cfa5e885a62f8f7370.zip
talos-petitboot-4caf65688fd16934235139cfa5e885a62f8f7370.tar.gz
discover/yaboot: support lilo & silo for x86 and Sparc.
The yaboot.conf format is essentially the same format as silo.conf and lilo.conf, especially if the author isn't using OF paths. This is a cheap way of getting support for silo and lilo. Signed-off-by: Jeff Bailey <jeffbailey@google.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
-rw-r--r--discover/yaboot-parser.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c
index 4dd1ea5..aa99392 100644
--- a/discover/yaboot-parser.c
+++ b/discover/yaboot-parser.c
@@ -325,11 +325,15 @@ static struct conf_global_option yaboot_global_options[] = {
static const char *const yaboot_conf_files[] = {
"/yaboot.conf",
"/yaboot.cnf",
+ "/etc/lilo.conf",
+ "/etc/silo.conf",
"/etc/yaboot.conf",
"/etc/yaboot.cnf",
"/suseboot/yaboot.cnf",
"/YABOOT.CONF",
"/YABOOT.CNF",
+ "/ETC/LILO.CONF",
+ "/ETC/SILO.CONF",
"/ETC/YABOOT.CONF",
"/ETC/YABOOT.CNF",
"/SUSEBOOT/YABOOT.CNF",
OpenPOWER on IntegriCloud