summaryrefslogtreecommitdiffstats
path: root/devices
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2007-04-05 15:33:58 +1000
committerJeremy Kerr <jk@ozlabs.org>2007-04-05 15:33:58 +1000
commiteff968df2ac394b4ebbef0ad6f91d833ca0f22b6 (patch)
treed283adb4be8a3c943a306ef296ce7c40c8816c1d /devices
parentd353f6e823d5b8cb949e20ae1139a5b7fbb0478b (diff)
downloadtalos-petitboot-eff968df2ac394b4ebbef0ad6f91d833ca0f22b6.tar.gz
talos-petitboot-eff968df2ac394b4ebbef0ad6f91d833ca0f22b6.zip
Fix space issue with kboot parser.
We weren't adding spaces around foo=bar kernel command-line parameters. Also, use the short name for the kernel path in the (debug) description field. Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'devices')
-rw-r--r--devices/kboot-parser.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/devices/kboot-parser.c b/devices/kboot-parser.c
index 27f3025..4b997e7 100644
--- a/devices/kboot-parser.c
+++ b/devices/kboot-parser.c
@@ -121,6 +121,7 @@ static int parse_option(struct boot_option *opt, char *config)
root = value;
} else {
+ strcat(cmdline, " ");
*(value - 1) = '=';
strcat(cmdline, name);
}
@@ -149,7 +150,7 @@ static int parse_option(struct boot_option *opt, char *config)
printf("kboot cmdline: %s", cmdline);
opt->boot_args = cmdline;
- asprintf(&opt->description, "%s %s", opt->boot_image_file, cmdline);
+ asprintf(&opt->description, "%s %s", config, cmdline);
return 1;
}
OpenPOWER on IntegriCloud