#include "resource.h"
struct yaboot_state {
- struct discover_boot_option *opt;
char *desc_image;
char *desc_initrd;
int globals_done;
const char *const *known_names;
+
+ /* current option data */
+ struct discover_boot_option *opt;
+ const char *initrd_size;
+ const char *literal;
+ const char *ramdisk;
+ const char *root;
+ bool read_only;
+ bool read_write;
};
+static struct discover_boot_option *state_start_new_option(
+ struct conf_context *conf,
+ struct yaboot_state *state)
+{
+ state->desc_initrd = NULL;
+
+ state->opt = discover_boot_option_create(conf->dc, conf->dc->device);
+ state->opt->option->boot_args = talloc_strdup(state->opt->option, "");
+
+ /* old allocated values will get freed with the state */
+ state->initrd_size = conf_get_global_option(conf, "initrd_size");
+ state->literal = conf_get_global_option(conf, "literal");
+ state->ramdisk = conf_get_global_option(conf, "ramdisk");
+ state->root = conf_get_global_option(conf, "root");
+
+ return state->opt;
+}
+
static void yaboot_finish(struct conf_context *conf)
{
struct yaboot_state *state = conf->parser_info;
assert(opt->name);
assert(opt->boot_args);
+ /* populate the boot option from state data */
+ if (state->initrd_size) {
+ opt->boot_args = talloc_asprintf(opt, "ramdisk_size=%s %s",
+ state->initrd_size, opt->boot_args);
+ }
+
+ if (state->ramdisk) {
+ opt->boot_args = talloc_asprintf(opt, "ramdisk=%s %s",
+ state->initrd_size, opt->boot_args);
+ }
+
+ if (state->root) {
+ opt->boot_args = talloc_asprintf(opt, "root=%s %s",
+ state->root, opt->boot_args);
+ }
+
+ if (state->read_only && state->read_write) {
+ pb_log("boot option %s specified both 'ro' and 'rw', "
+ "using 'rw'\n", opt->name);
+ state->read_only = false;
+ }
+
+ if (state->read_only || state->read_write) {
+ opt->boot_args = talloc_asprintf(opt, "%s %s",
+ state->read_only ? "ro" : "rw",
+ opt->boot_args);
+ }
+
+ if (state->literal) {
+ opt->boot_args = talloc_strdup(opt, state->literal);
+ }
+
opt->description = talloc_asprintf(opt, "%s %s %s",
state->desc_image,
(state->desc_initrd ? state->desc_initrd : ""),
- opt->boot_args);
+ opt->boot_args ? opt->boot_args : "");
talloc_free(state->desc_initrd);
- state->desc_initrd = NULL;
conf_strip_str(opt->boot_args);
conf_strip_str(opt->description);
- /* opt is persistent, so must be associated with device */
-
discover_context_add_boot_option(conf->dc, state->opt);
-
- state->opt = discover_boot_option_create(conf->dc, conf->dc->device);
- state->opt->option->boot_args = talloc_strdup(state->opt->option, "");
}
static struct resource *create_yaboot_devpath_resource(
+ struct discover_boot_option *opt,
struct conf_context *conf,
const char *path, char **desc_str)
{
devpath = talloc_strdup(conf, path);
}
- res = create_devpath_resource(conf->dc, conf->dc->device, devpath);
+ res = create_devpath_resource(opt, conf->dc->device, devpath);
if (desc_str)
*desc_str = devpath;
if (streq(name, "image")) {
/* First finish any previous image. */
- if (opt->boot_image)
+ if (opt)
yaboot_finish(conf);
/* Then start the new image. */
- opt->boot_image = create_yaboot_devpath_resource(conf,
- value, &state->desc_image);
+ opt = state_start_new_option(conf, state);
+
+ opt->boot_image = create_yaboot_devpath_resource(opt,
+ conf, value, &state->desc_image);
return;
}
if (suse_fp) {
/* First finish any previous image. */
-
- if (opt->boot_image)
+ if (opt)
yaboot_finish(conf);
/* Then start the new image. */
+ opt = state_start_new_option(conf, state);
if (*value == '/') {
- opt->boot_image = create_yaboot_devpath_resource(
+ opt->boot_image = create_yaboot_devpath_resource(opt,
conf, value, &state->desc_image);
} else {
char *tmp;
- opt->boot_image = create_yaboot_devpath_resource(
+ opt->boot_image = create_yaboot_devpath_resource(opt,
conf, suse_fp->image,
&state->desc_image);
- opt->initrd = create_yaboot_devpath_resource(
+ opt->initrd = create_yaboot_devpath_resource(opt,
conf, suse_fp->initrd, &tmp);
state->desc_initrd = talloc_asprintf(opt,
return;
}
- if (!opt->boot_image) {
+ /* all other processing requires an image */
+ if (!opt) {
pb_log("%s: unknown name: %s\n", __func__, name);
return;
}
/* initrd */
if (streq(name, "initrd")) {
- opt->initrd = create_yaboot_devpath_resource(conf,
+ opt->initrd = create_yaboot_devpath_resource(opt, conf,
value, &state->desc_image);
return;
}
if (streq(name, "initrd-size")) {
- opt->option->boot_args = talloc_asprintf_append(
- opt->option->boot_args, "ramdisk_size=%s ", value);
+ state->initrd_size = talloc_strdup(state, value);
return;
}
if (streq(name, "literal")) {
- if (*opt->option->boot_args) {
- pb_log("%s: literal over writes '%s'\n", __func__,
- opt->option->boot_args);
- talloc_free(opt->option->boot_args);
- }
- talloc_asprintf(opt->option, "%s ", value);
+ state->literal = talloc_strdup(state, value);
return;
}
if (streq(name, "ramdisk")) {
- opt->option->boot_args = talloc_asprintf_append(
- opt->option->boot_args, "ramdisk=%s ", value);
+ state->ramdisk = talloc_strdup(state, value);
return;
}
if (streq(name, "read-only")) {
- opt->option->boot_args = talloc_asprintf_append(
- opt->option->boot_args, "ro ");
+ state->read_only = true;
return;
}
if (streq(name, "read-write")) {
- opt->option->boot_args = talloc_asprintf_append(
- opt->option->boot_args, "rw ");
+ state->read_write = true;
return;
}
if (streq(name, "root")) {
- opt->option->boot_args = talloc_asprintf_append(
- opt->option->boot_args, "root=%s ", value);
+ state->root = talloc_strdup(state, value);
return;
}
}
static struct conf_global_option yaboot_global_options[] = {
+ { .name = "root" },
{ .name = "boot" },
{ .name = "initrd" },
+ { .name = "initrd_size" },
{ .name = "partition" },
{ .name = "video" },
+ { .name = "literal" },
+ { .name = "ramdisk" },
{ .name = NULL },
};
state->known_names = yaboot_known_names;
- /* opt is persistent, so must be associated with device */
-
- state->opt = discover_boot_option_create(conf->dc, conf->dc->device);
- state->opt->option->boot_args = talloc_strdup(state->opt->option, "");
+ state->opt = NULL;
conf_parse_buf(conf, buf, len);
return 1;
}
-struct parser __yaboot_parser = {
- .name = "yaboot",
- .parse = yaboot_parse,
- .filenames = yaboot_conf_files,
+static struct parser yaboot_parser = {
+ .name = "yaboot",
+ .method = CONF_METHOD_LOCAL_FILE,
+ .parse = yaboot_parse,
+ .filenames = yaboot_conf_files,
+ .resolve_resource = resolve_devpath_resource,
};
+
+register_parser(yaboot_parser);
projects / petitboot / blobdiff