From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Fri, 3 Feb 2012 03:45:30 +0000 (-0500)
Subject: Pass actual /mnt/unionfs mount point to mount(2) instead of "none"
X-Git-Url: https://git.fsl.cs.stonybrook.edu/?a=commitdiff_plain;h=65effc081fdffdb6a8f8cf4e206253a0ba4f3d67;p=unionfs-regression.git

Pass actual /mnt/unionfs mount point to mount(2) instead of "none"

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>
---

diff --git a/scaffold b/scaffold
index b592f62..e42875b 100644
--- a/scaffold
+++ b/scaffold
@@ -240,7 +240,7 @@ function mount_union {
                 shift
         done
 
-        mount -t unionfs -o $OPTION none $MOUNTPOINT
+        mount -t unionfs -o $OPTION $MOUNTPOINT $MOUNTPOINT
 
 	MOUNTS=$((MOUNTS + 1))
 
diff --git a/t-brm.sh b/t-brm.sh
index be75256..0b01cac 100755
--- a/t-brm.sh
+++ b/t-brm.sh
@@ -41,10 +41,10 @@ FILES
 ( directories ; beforefiles) | create_hierarchy
 
 mount_union "" $LOWER_DIR0
-mount -t unionfs -o remount,add=$LOWER_DIR1 none $MOUNTPOINT || exit $?
-mount -t unionfs -o remount,add=:$LOWER_DIR2=ro none $MOUNTPOINT || exit $?
-mount -t unionfs -o remount,del=$LOWER_DIR1,add=$LOWER_DIR3 none $MOUNTPOINT || exit $?
-mount -t unionfs -o remount,mode=$LOWER_DIR0=ro,del=$LOWER_DIR2 none $MOUNTPOINT || exit $?
+mount -t unionfs -o remount,add=$LOWER_DIR1 $MOUNTPOINT $MOUNTPOINT || exit $?
+mount -t unionfs -o remount,add=:$LOWER_DIR2=ro $MOUNTPOINT $MOUNTPOINT || exit $?
+mount -t unionfs -o remount,del=$LOWER_DIR1,add=$LOWER_DIR3 $MOUNTPOINT $MOUNTPOINT || exit $?
+mount -t unionfs -o remount,mode=$LOWER_DIR0=ro,del=$LOWER_DIR2 $MOUNTPOINT $MOUNTPOINT || exit $?
 
 # test if the union contains only f0 and f3
 test -f $MOUNTPOINT/f0 || exit $?