From 4cec72bb1691e446750d09824d3f478f510c0144 Mon Sep 17 00:00:00 2001 From: Zhihao Cheng Date: Wed, 25 Sep 2019 14:35:33 +0800 Subject: [PATCH] overlay: Enable character device to be the base fs partition When running overlay tests using character devices as base fs partitions, all overlay usecase results become 'notrun'. Function '_overay_config_override' (common/config) detects that the current base fs partition is not a block device and will set FSTYP to base fs. The overlay usecase will check the current FSTYP, and if it is not 'overlay' or 'generic', it will skip the execution. For example, using UBIFS as base fs skips all overlay usecases: FSTYP -- ubifs # FSTYP should be overridden as 'overlay' MKFS_OPTIONS -- /dev/ubi0_1 # Character device MOUNT_OPTIONS -- -t ubifs /dev/ubi0_1 /tmp/scratch overlay/001 [not run] not suitable for this filesystem type: ubifs overlay/002 [not run] not suitable for this filesystem type: ubifs overlay/003 [not run] not suitable for this filesystem type: ubifs When checking that the base fs partition is a block/character device, FSTYP is overwritten as 'overlay'. This patch allows the base fs partition to be a character device that can also execute overlay usecases (such as ubifs). Signed-off-by: Zhihao Cheng Reviewed-by: Amir Goldstein Signed-off-by: Eryu Guan --- common/config | 6 +++--- common/rc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/config b/common/config index 4c86a492..4eda36c7 100644 --- a/common/config +++ b/common/config @@ -532,7 +532,7 @@ _canonicalize_mountpoint() # When SCRATCH/TEST_* vars are defined in evironment and not # in config file, this function is called after vars have already # been overriden in the previous test. -# In that case, TEST_DEV is a directory and not a blockdev and +# In that case, TEST_DEV is a directory and not a blockdev/chardev and # the function will return without overriding the SCRATCH/TEST_* vars. _overlay_config_override() { @@ -550,7 +550,7 @@ _overlay_config_override() # the new OVL_BASE_SCRATCH/TEST_DEV/MNT vars are set to the values # of the configured base fs and SCRATCH/TEST_DEV vars are set to the # overlayfs base and mount dirs inside base fs mount. - [ -b "$TEST_DEV" ] || return 0 + [ -b "$TEST_DEV" ] || [ -c "$TEST_DEV" ] || return 0 # Config file may specify base fs type, but we obay -overlay flag [ "$FSTYP" == overlay ] || export OVL_BASE_FSTYP="$FSTYP" @@ -570,7 +570,7 @@ _overlay_config_override() export TEST_DIR="$OVL_BASE_TEST_DIR/$OVL_MNT" export MOUNT_OPTIONS="$OVERLAY_MOUNT_OPTIONS" - [ -b "$SCRATCH_DEV" ] || return 0 + [ -b "$SCRATCH_DEV" ] || [ -c "$SCRATCH_DEV" ] || return 0 # Store original base fs vars export OVL_BASE_SCRATCH_DEV="$SCRATCH_DEV" diff --git a/common/rc b/common/rc index 66c7fd4d..8d57c371 100644 --- a/common/rc +++ b/common/rc @@ -3100,7 +3100,7 @@ _require_scratch_shutdown() # SCRATCH_DEV, in this case OVL_BASE_SCRATCH_DEV # will be null, so check OVL_BASE_SCRATCH_DEV before # running shutdown to avoid shutting down base fs accidently. - _notrun "$SCRATCH_DEV is not a block device" + _notrun "This test requires a valid $OVL_BASE_SCRATCH_DEV as ovl base fs" else src/godown -f $OVL_BASE_SCRATCH_MNT 2>&1 \ || _notrun "Underlying filesystem does not support shutdown" -- 2.30.2