[Fai-commit] r6136 - trunk/bin

[Michael Tautschnig]

Author: mt
Date: 2010-10-14 22:58:48 +0000 (Thu, 14 Oct 2010)
New Revision: 6136

Modified:
   trunk/bin/fai
   trunk/bin/make-fai-nfsroot
Log:
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.


Modified: trunk/bin/fai
===================================================================
--- trunk/bin/fai	2010-10-14 22:41:48 UTC (rev 6135)
+++ trunk/bin/fai	2010-10-14 22:58:48 UTC (rev 6136)
@@ -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

Modified: trunk/bin/make-fai-nfsroot
===================================================================
--- trunk/bin/make-fai-nfsroot	2010-10-14 22:41:48 UTC (rev 6135)
+++ trunk/bin/make-fai-nfsroot	2010-10-14 22:58:48 UTC (rev 6136)
@@ -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