- rel 4; exact matching for /proc/partitions rootfs based matching

[packages/geninitrd.git] / geninitrd-svn.patch

diff --git a/geninitrd-svn.patch b/geninitrd-svn.patch
index cc9b06d682d91f217637fb0677b28c2468127cc8..758120328ba5e64fcccb5c2923bc09f8db99fded 100644 (file)
--- a/geninitrd-svn.patch
+++ b/geninitrd-svn.patch
@@ -1,16 +1,15 @@
 Index: geninitrd
 ===================================================================
---- geninitrd  (wersja 12174)
+--- geninitrd  (wersja 12474)
 +++ geninitrd  (kopia robocza)
-@@ -772,9 +772,9 @@
-                       device=$rootdev
-               fi
+@@ -792,8 +792,8 @@
+                               if (c ~ "^" dev_pattern "$") partition = c;
+                       }
  
--              [ -n "$ROOTFSFLAG" ] && ROOTFSFLAGS="-o $ROOTFSFLAGS"
-+              [ -n "$ROOTFSFLAGS" ] && ROOTFSFLAGS="-o $ROOTFSFLAGS"
+-                      $4 ~ partition { maj = $1; min = $2; }
+-                      $1 ~ maj && $2 ~ min { partition = $4; }
++                      $4 == partition { maj = $1; min = $2; }
++                      $1 == maj && $2 == min { partition = $4; }
  
--              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
+                       END {
+                               if (maj >= 0 && min >= 0) {