diff options
| author | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-27 14:34:57 +1000 |
|---|---|---|
| committer | Samuel Mendoza-Jonas <sam@mendozajonas.com> | 2018-08-28 13:46:11 +1000 |
| commit | 93065a40773611096f2b1e095563ae21c5056c93 (patch) | |
| tree | 86c35fcdcafe95be28731ba7809b66eabc87994f /discover/kboot-parser.c | |
| parent | 3917e88b838001b13a19fc6ea01d08b08c0770ca (diff) | |
| download | talos-petitboot-93065a40773611096f2b1e095563ae21c5056c93.tar.gz talos-petitboot-93065a40773611096f2b1e095563ae21c5056c93.zip | |
discover/kboot-parser: Recognise 'default' parameterv1.9.1
The kboot parser doesn't set a default option. Change it so that if we
see the 'default' parameter we match against this value when deciding if
an option should be set as default.
For example:
default=linux
linux='/vmlinux initrd=/initrd arg1=value1 arg2'
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
Diffstat (limited to 'discover/kboot-parser.c')
| -rw-r--r-- | discover/kboot-parser.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/discover/kboot-parser.c b/discover/kboot-parser.c index e4b36b6..4c68cd4 100644 --- a/discover/kboot-parser.c +++ b/discover/kboot-parser.c @@ -126,6 +126,10 @@ out_add: " dtb=%s", dtb); } + if (conf_get_global_option(conf, "default")) + opt->is_default = streq(opt->name, + conf_get_global_option(conf, "default")); + conf_strip_str(opt->boot_args); conf_strip_str(opt->description); @@ -137,6 +141,7 @@ static struct conf_global_option kboot_global_options[] = { { .name = "initrd" }, { .name = "root" }, { .name = "video" }, + { .name = "default" }, { .name = NULL } }; @@ -157,7 +162,6 @@ static const char *const kboot_conf_files[] = { }; static const char *const kboot_ignored_names[] = { - "default", "delay", "message", "timeout", |
