aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gfxboot
diff options
context:
space:
mode:
authorSteffen Winterfeldt <snwint@suse.de>2011-04-19 15:27:26 +0200
committerSebastian Herbszt <herbszt@gmx.de>2011-04-24 15:31:16 +0200
commitc53f30a204d710b776c22535fa53818043f6e2f1 (patch)
tree7d246c01a9e746cef2bae6fef1a4004782f2de13 /com32/gfxboot
parentece69c7abc5b24523251e22a077951f2111311ad (diff)
downloadsyslinux-c53f30a204d710b776c22535fa53818043f6e2f1.tar.gz
syslinux-c53f30a204d710b776c22535fa53818043f6e2f1.tar.xz
syslinux-c53f30a204d710b776c22535fa53818043f6e2f1.zip
gfxboot: handle INITRD config line
Handle case where there is no initrd= option but a separate initrd config line. Signed-off-by: Sebastian Herbszt <herbszt@gmx.de>
Diffstat (limited to 'com32/gfxboot')
-rw-r--r--com32/gfxboot/gfxboot.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
index 37499202..9a39e79f 100644
--- a/com32/gfxboot/gfxboot.c
+++ b/com32/gfxboot/gfxboot.c
@@ -922,11 +922,15 @@ void boot_entry(menu_t *menu_ptr, char *arg)
*skip_nonspaces(s) = 0;
initrd_arg = s;
}
+ else if(initrd_arg) {
+ free(s0);
+ initrd_arg = s0 = strdup(initrd_arg);
+ }
if(initrd_arg) {
initrd = initramfs_init();
- while((t = strsep(&s, ","))) {
+ while((t = strsep(&initrd_arg, ","))) {
initrd_buf = load_one(t, &initrd_size);
if(!initrd_buf) {