From 3dd6174e0d12120d9d1e25d0bf99ddf71aeac0e701f4a11a77c2719157c50400 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Tue, 19 Apr 2011 13:31:54 +0000
Subject: [PATCH] - handle case where a separate initrd config line is used
 instead of an   initrd= kernel option

OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=28
---
 syslinux-4.04-cwd.diff      |  2 +-
 syslinux-4.04-noinitrd.diff | 21 +++++++++++++++++++++
 syslinux.changes            |  6 ++++++
 syslinux.spec               |  2 ++
 4 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 syslinux-4.04-noinitrd.diff

diff --git a/syslinux-4.04-cwd.diff b/syslinux-4.04-cwd.diff
index 9453c58..f1b512c 100644
--- a/syslinux-4.04-cwd.diff
+++ b/syslinux-4.04-cwd.diff
@@ -1,5 +1,5 @@
 diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
-index 3749920..00d168a 100644
+index 9a39e79..35d180a 100644
 --- a/com32/gfxboot/gfxboot.c
 +++ b/com32/gfxboot/gfxboot.c
 @@ -102,6 +102,8 @@ typedef struct __attribute__ ((packed)) {
diff --git a/syslinux-4.04-noinitrd.diff b/syslinux-4.04-noinitrd.diff
new file mode 100644
index 0000000..749f887
--- /dev/null
+++ b/syslinux-4.04-noinitrd.diff
@@ -0,0 +1,21 @@
+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) {
diff --git a/syslinux.changes b/syslinux.changes
index 651ec9b..86250b1 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 19 15:29:10 CEST 2011 - snwint@suse.de
+
+- handle case where a separate initrd config line is used instead of an
+  initrd= kernel option
+
 -------------------------------------------------------------------
 Tue Apr 19 10:48:40 CEST 2011 - snwint@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index be3e6c5..5dd915a 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -33,6 +33,7 @@ Source1:        isolinux-config
 Source2:        README.gfxboot
 Patch0:         %{name}-%{version}-iso9660.diff
 Patch1:         %{name}-%{version}-cwd.diff
+Patch2:         %{name}-%{version}-noinitrd.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -51,6 +52,7 @@ Authors:
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 cp %{SOURCE2} .