packages: geninitrd/geninitrd-svn.patch, geninitrd/geninitrd.spec - rel 4; ...

[arekm]

Author: arekm                        Date: Fri Mar  4 09:25:01 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4; fallback to ls bug fixed

---- Files affected:
packages/geninitrd:
   geninitrd-svn.patch (2.1 -> 2.2) , geninitrd.spec (2.177 -> 2.178) 

---- Diffs:

================================================================
Index: packages/geninitrd/geninitrd-svn.patch
diff -u packages/geninitrd/geninitrd-svn.patch:2.1 packages/geninitrd/geninitrd-svn.patch:2.2
--- packages/geninitrd/geninitrd-svn.patch:2.1	Tue Mar  1 11:34:47 2011
+++ packages/geninitrd/geninitrd-svn.patch	Fri Mar  4 10:24:56 2011
@@ -14,3 +14,16 @@
  		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

================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.177 packages/geninitrd/geninitrd.spec:2.178
--- packages/geninitrd/geninitrd.spec:2.177	Tue Mar  1 11:34:47 2011
+++ packages/geninitrd/geninitrd.spec	Fri Mar  4 10:24:56 2011
@@ -9,7 +9,7 @@
 Name:		geninitrd
 Version:	10000.32
 # leave rel 1 for ac
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/System
 Source0:	%{name}-%{version}.tar.gz
@@ -125,6 +125,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 2.178  2011/03/04 09:24:56  arekm
+- rel 4; fallback to ls bug fixed
+
 Revision 2.177  2011/03/01 10:34:47  arekm
 - rel 3; bugfix for users using rootfsflags boot option
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd-svn.patch?r1=2.1&r2=2.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.177&r2=2.178&f=u