Author: arekm Date: Tue Mar 1 10:34:53 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3; bugfix for users using rootfsflags boot option
---- Files affected:
packages/geninitrd:
geninitrd.spec (2.176 -> 2.177) , geninitrd-svn.patch (NONE -> 2.1) (NEW)
---- Diffs:
================================================================
Index: packages/geninitrd/geninitrd.spec
diff -u packages/geninitrd/geninitrd.spec:2.176
packages/geninitrd/geninitrd.spec:2.177
--- packages/geninitrd/geninitrd.spec:2.176 Fri Feb 25 17:08:26 2011
+++ packages/geninitrd/geninitrd.spec Tue Mar 1 11:34:47 2011
@@ -9,13 +9,14 @@
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
@@ -92,6 +93,7 @@
%patch0 -p1
%patch1 -p1
%endif
+%patch2 -p0
%build
%{__make}
@@ -123,6 +125,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 2.177 2011/03/01 10:34:47 arekm
+- rel 3; bugfix for users using rootfsflags boot option
+
Revision 2.176 2011/02/25 16:08:26 arekm
- rel 2; no negative reports
================================================================
Index: packages/geninitrd/geninitrd-svn.patch
diff -u /dev/null packages/geninitrd/geninitrd-svn.patch:2.1
--- /dev/null Tue Mar 1 11:34:53 2011
+++ packages/geninitrd/geninitrd-svn.patch Tue Mar 1 11:34:47 2011
@@ -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
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/geninitrd/geninitrd.spec?r1=2.176&r2=2.177&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
