X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fyaboot-parser.c;h=b62f39db7a9466a3d2da2fdd8698568d6dabedff;hp=4dd1ea5be9648214f7a14b64b837839723fb9e60;hb=1def8f21aecc41ac22652e7b8bd1f5bf7a4dae98;hpb=e900b77853c4d890e3d173256451a586d6f639e7 diff --git a/discover/yaboot-parser.c b/discover/yaboot-parser.c index 4dd1ea5..b62f39d 100644 --- a/discover/yaboot-parser.c +++ b/discover/yaboot-parser.c @@ -114,6 +114,13 @@ static void yaboot_finish(struct conf_context *conf) /* populate the boot option from state data */ state->opt->boot_image = create_yaboot_devpath_resource(state, conf, state->boot_image); + + char* args_sigfile_default = talloc_asprintf(opt, + "%s.cmdline.sig", state->boot_image); + state->opt->args_sig_file = create_yaboot_devpath_resource(state, + conf, args_sigfile_default); + talloc_free(args_sigfile_default); + if (state->initrd) { state->opt->initrd = create_yaboot_devpath_resource(state, conf, state->initrd); @@ -325,11 +332,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",