discover/yaboot: support lilo & silo for x86 and Sparc.
authorJeff Bailey <jeffbailey@google.com>
Sun, 26 Jan 2014 00:48:24 +0000 (00:48 +0000)
committerJeremy Kerr <jk@ozlabs.org>
Wed, 23 Apr 2014 02:33:25 +0000 (10:33 +0800)
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>
discover/yaboot-parser.c

index 4dd1ea5be9648214f7a14b64b837839723fb9e60..aa993928f86c5b6121f6bce95c094f2b8f746501 100644 (file)
@@ -325,11 +325,15 @@ static struct conf_global_option yaboot_global_options[] = {
 static const char *const yaboot_conf_files[] = {
        "/yaboot.conf",
        "/yaboot.cnf",
 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/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",
        "/ETC/YABOOT.CONF",
        "/ETC/YABOOT.CNF",
        "/SUSEBOOT/YABOOT.CNF",