- rel 4; fallback to ls bug fixed

Changed files:
    geninitrd-svn.patch -> 2.2
    geninitrd.spec -> 2.178

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index cc9b06d682d91f217637fb0677b28c2468127cc8..c51766514826719270937e253824299ea2ca9c1e 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -14,3 +14,16 @@ Index: geninitrd
                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
+Index: geninitrd
+===================================================================
+--- geninitrd  (wersja 12182)
++++ geninitrd  (kopia robocza)
+@@ -709,7 +709,7 @@
+                       rootnr="$(busybox awk -v rootnode="${ROOT##/dev/}" '$4 == rootnode { print 256 * $1 + $2 }' /proc/partitions)"
+                       # fallback to ls
+                       if [ -z "$rootnr" ]; then
+-                              rootnr="$(busybox ls -lL ${ROOT} | awk '{if (/^b/) { print 256 * $3 + $4; }}')"
++                              rootnr="$(busybox ls -lL ${ROOT} | busybox awk '{if (/^b/) { print 256 * $3 + $4; }}')"
+                       fi
+                       if [ -n "$rootnr" ]; then
+                               echo "$rootnr" > /proc/sys/kernel/real-root-dev

diff --git a/geninitrd.spec b/geninitrd.spec
index b183e05502016f0a2733b8dcbd62ee45593ef77f..686bcb61b22c4598ed273e3a1d70b70170eb2593 100644 (file)
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8):      Narzędzie do tworzenia inicjalnego ramdysku używanego przy
 Name:          geninitrd
 Version:       10000.32
 # leave rel 1 for ac
-Release:       3
+Release:       4
 License:       GPL
 Group:         Applications/System
 Source0:       %{name}-%{version}.tar.gz