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 b592f624edaf25775f473a01cc660254bc087311..e42875b942bc0b30a6f6800cf7b929abc0c44473 100644 (file)
--- 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 be752569cc5273d0c51b0fb52f79d006c2a43487..0b01cac7f31cc76f7e055c23703c8199f599c423 100755 (executable)
--- 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 $?