- rel 3; bugfix for users using rootfsflags boot option

Changed files:
    geninitrd-svn.patch -> 2.1
    geninitrd.spec -> 2.177

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
new file mode 100644 (file)
index 0000000..cc9b06d
--- /dev/null
+++ b/geninitrd-svn.patch
@@ -0,0 +1,16 @@
+Index: geninitrd
+===================================================================
+--- geninitrd  (wersja 12174)
++++ geninitrd  (kopia robocza)
+@@ -772,9 +772,9 @@
+                       device=$rootdev
+               fi
+ 
+-              [ -n "$ROOTFSFLAG" ] && ROOTFSFLAGS="-o $ROOTFSFLAGS"
++              [ -n "$ROOTFSFLAGS" ] && ROOTFSFLAGS="-o $ROOTFSFLAGS"
+ 
+-              mount -t $rootfs -r $device $ROOTFSFLAGS /newroot
++              mount -t $rootfs -r $device $ROOTFSFLAGS /newroot || echo "Mount of rootfs failed."
+               init="$(echo "$CMDLINE" | busybox awk '/init=\// { gsub(/.*init=/,NIL,$0); gsub(/ .*/,NIL,$0); print }')"
+               if [ -z "$init" -o ! -x "/newroot$init" ]; then
+                       init=/sbin/init

diff --git a/geninitrd.spec b/geninitrd.spec
index 104befdf05ab476f14fc20dfc5673c87380b5f9f..b183e05502016f0a2733b8dcbd62ee45593ef77f 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -8,13 +8,14 @@ Summary(pl.UTF-8):    Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:          geninitrd
 Version:       10000.32
 # leave rel 1 for ac
-Release:       2
+Release:       3
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz
 # Source0-md5: 9d75e347ff49312209e97ead93378f4a
 Patch0:                %{name}-romfs.patch
 Patch1:                %{name}-gzip-compressor.patch
+Patch2:                %{name}-svn.patch
 BuildRequires: xmlto >= 0:0.0.18-1
 Requires:      /usr/bin/ldd
 Requires:      awk
@@ -91,6 +92,7 @@ bieżących informacji zawartych w /etc/modules.conf.
 %patch0 -p1
 %patch1 -p1
 %endif
+%patch2 -p0
 
 %build
 %{__make}