r2788 - in dists/trunk/live-initramfs: docs scripts

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-08-21 19:05:47 +0000 (Tue, 21 Aug 2007)
New Revision: 2788

Modified:
   dists/trunk/live-initramfs/docs/ChangeLog
   dists/trunk/live-initramfs/scripts/live
Log:


Modified: dists/trunk/live-initramfs/docs/ChangeLog
===================================================================
--- dists/trunk/live-initramfs/docs/ChangeLog	2007-08-20 21:20:15 UTC (rev 2787)
+++ dists/trunk/live-initramfs/docs/ChangeLog	2007-08-21 19:05:47 UTC (rev 2788)
@@ -1,3 +1,10 @@
+2007-08-21  Daniel Baumann  <daniel at debian.org>
+
+	* scripts/live:
+	  - Applied patch from Jesse W. Hathaway <jesse at mbuki-mvuki.org> to
+	    not use nfsro with kernels larger than 2.6.22 (where unionfs 2.x
+	    is supposed to be available soon).
+
 2007-08-11  Daniel Baumann  <daniel at debian.org>
 
 	* Uploaded 1.95.2-1.

Modified: dists/trunk/live-initramfs/scripts/live
===================================================================
--- dists/trunk/live-initramfs/scripts/live	2007-08-20 21:20:15 UTC (rev 2787)
+++ dists/trunk/live-initramfs/scripts/live	2007-08-21 19:05:47 UTC (rev 2788)
@@ -635,8 +635,10 @@
     # Let's just mount the read-only file systems first
     rofsstring=""
     rofslist=""
-    if [ "${NETBOOT}" = "nfs" ] ; then
-        roopt="nfsro" # go aroung a bug in nfs-unionfs locking
+    minor_kernel_version=`uname -r|cut -c 5-|sed 's/[^0-9].*//'`
+    if [ "${NETBOOT}" = "nfs" ] && [ "${minor_kernel_version}" -lt 22 ]; then
+        # go aroung a bug in nfs-unionfs locking for unionfs <= 1.4
+        roopt="nfsro"
     else
         roopt="ro"
     fi