common: export overlay lower/upper/work directories as variables

This turns hard coded lower/upper/work dir names to configurable
variables.

Suggested-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/common/config b/common/config
index b5f6fd42c846af1763272a16332ad8d1884dacab..c97facf80677b82eff1adef6833c40e9fa0c7290 100644 (file)
--- a/common/config
+++ b/common/config
@@ -77,6 +77,9 @@ export XFS_MKFS_OPTIONS=${XFS_MKFS_OPTIONS:=-bsize=4096}
 export TIME_FACTOR=${TIME_FACTOR:=1}
 export LOAD_FACTOR=${LOAD_FACTOR:=1}
 export DEBUGFS_MNT=${DEBUGFS_MNT:="/sys/kernel/debug"}
+export OVERLAY_UPPER_DIR=${OVERLAY_UPPER_DIR:="upper"}
+export OVERLAY_LOWER_DIR=${OVERLAY_LOWER_DIR:="lower"}
+export OVERLAY_WORK_DIR=${OVERLAY_WORK_DIR:="work"}
 
 export PWD=`pwd`
 #export DEBUG=${DEBUG:=...} # arbitrary CFLAGS really.

diff --git a/common/rc b/common/rc
index e4a163d726b02984a46ee88276b5c8f4a851583e..b7427850d713997847af3af6631e7b11dc849510 100644 (file)
--- a/common/rc
+++ b/common/rc
@@ -244,7 +244,7 @@ _common_dev_mount_options()
 
 _overlay_basic_mount_options()
 {
-       echo "-o lowerdir=$1/lower,upperdir=$1/upper,workdir=$1/work"
+       echo "-o lowerdir=$1/$OVERLAY_LOWER_DIR,upperdir=$1/$OVERLAY_UPPER_DIR,workdir=$1/$OVERLAY_WORK_DIR"
 }
 
 _overlay_mount_options()
@@ -273,14 +273,14 @@ _overlay_mount()
        local dir=$1
        local mnt=$2
        shift 2
-       mkdir -p $dir/upper
-       mkdir -p $dir/lower
-       mkdir -p $dir/work
+       mkdir -p $dir/$OVERLAY_UPPER_DIR
+       mkdir -p $dir/$OVERLAY_LOWER_DIR
+       mkdir -p $dir/$OVERLAY_WORK_DIR
 
        $MOUNT_PROG -t overlay $SELINUX_MOUNT_OPTIONS \
-                   -o lowerdir=$dir/lower \
-                   -o upperdir=$dir/upper \
-                   -o workdir=$dir/work   \
+                   -o lowerdir=$dir/$OVERLAY_LOWER_DIR \
+                   -o upperdir=$dir/$OVERLAY_UPPER_DIR \
+                   -o workdir=$dir/$OVERLAY_WORK_DIR   \
                    $OVERLAY_MOUNT_OPTIONS $* \
                    $dir $mnt
 }