apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Eryu Guan
2016-02-08 09:27:14 +11:00
committed by Dave Chinner
parent 22bc781c39
commit 379d6e0130
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/config
+3
View File
@@ -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.
common/rc
+7 -7
View File
@@ -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
}