[syslinux:master] gfxboot: handle INITRD config line

syslinux-bot for Steffen Winterfeldt snwint at suse.de
Mon Apr 25 15:29:29 PDT 2011


Commit-ID:  c53f30a204d710b776c22535fa53818043f6e2f1
Gitweb:     http://syslinux.zytor.com/commit/c53f30a204d710b776c22535fa53818043f6e2f1
Author:     Steffen Winterfeldt <snwint at suse.de>
AuthorDate: Tue, 19 Apr 2011 15:27:26 +0200
Committer:  Sebastian Herbszt <herbszt at gmx.de>
CommitDate: Sun, 24 Apr 2011 15:31:16 +0200

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 at gmx.de>


---
 com32/gfxboot/gfxboot.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
index 3749920..9a39e79 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) {



More information about the Syslinux-commits mailing list