[Fai-commit] r6123 - branches/experimental/patches

[Michael Tautschnig]

Author: mt
Date: 2010-10-12 22:30:55 +0000 (Tue, 12 Oct 2010)
New Revision: 6123

Added:
   branches/experimental/patches/df-POSIX-bugfix
Modified:
   branches/experimental/patches/series
Log:
Added michael log's patch for df calls


Added: branches/experimental/patches/df-POSIX-bugfix
===================================================================
--- branches/experimental/patches/df-POSIX-bugfix	                        (rev 0)
+++ branches/experimental/patches/df-POSIX-bugfix	2010-10-12 22:30:55 UTC (rev 6123)
@@ -0,0 +1,30 @@
+2010-10-12  Michael Tautschnig  <mt at debian.org>
+
+	* fai, make-fai-nfsroot: Use df -P for guaranteed one-line-is-one-mount output
+		(thanks michael log <mmlogin at gmail.com> for the patch).
+Index: trunk/bin/fai
+===================================================================
+--- trunk.orig/bin/fai
++++ trunk/bin/fai	
+@@ -225,7 +225,7 @@
+     FAI_ROOT=$(cd $FAI_ROOT;pwd)
+ 
+     # check if target directory is mounted with bad options
+-    fs=$(df $FAI_ROOT | tail -1 | awk '{print $6}')
++    fs=$(df -P $FAI_ROOT | tail -1 | awk '{print $6}')
+     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
+ 	echo "Target directory is mounted using nosuid or nodev. Aborting"
+ 	exit 5
+Index: trunk/bin/make-fai-nfsroot
+===================================================================
+--- trunk.orig/bin/make-fai-nfsroot
++++ trunk/bin/make-fai-nfsroot	
+@@ -234,7 +234,7 @@
+ call_debootstrap() {
+     
+     # check if NFSROOT directory is mounted with bad options
+-    fs=$(df $NFSROOT | tail -1 | awk '{print $6}')
++    fs=$(df -P $NFSROOT | tail -1 | awk '{print $6}')
+     if mount | grep "on $fs " |  awk '{print $6}' | egrep -q "nosuid|nodev"; then
+         die 1 "NFSROOT directory $NFSROOT is mounted using nosuid or nodev. Aborting"
+     fi

Modified: branches/experimental/patches/series
===================================================================
--- branches/experimental/patches/series	2010-10-12 21:33:54 UTC (rev 6122)
+++ branches/experimental/patches/series	2010-10-12 22:30:55 UTC (rev 6123)
@@ -23,3 +23,4 @@
 install-packages_hold-bugfix
 setup-storage_no-empty-config
 setup-storage_entire-disk-in-volume
+df-POSIX-bugfix