[Fai-commit] r6154 - branches/stable/3.4/bin

[Michael Prokop]

Author: mika
Date: 2010-10-15 11:08:26 +0000 (Fri, 15 Oct 2010)
New Revision: 6154

Modified:
   branches/stable/3.4/bin/fai
   branches/stable/3.4/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: branches/stable/3.4/bin/fai
===================================================================
--- branches/stable/3.4/bin/fai	2010-10-15 11:07:32 UTC (rev 6153)
+++ branches/stable/3.4/bin/fai	2010-10-15 11:08:26 UTC (rev 6154)
@@ -240,7 +240,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: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot	2010-10-15 11:07:32 UTC (rev 6153)
+++ branches/stable/3.4/bin/make-fai-nfsroot	2010-10-15 11:08:26 UTC (rev 6154)
@@ -237,7 +237,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 "NFSROOT directory $NFSROOT is mounted using nosuid or nodev. Aborting"
     fi