From fd3388c5895a79a2f6630b7bff7c5388c72f1f55 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Thomas=20Wei=C3=9Fschuh?= Date: Sun, 31 Dec 2023 14:00:18 +0100 Subject: [PATCH] wipefs: (tests) remove necessity of root permissions MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Weißschuh --- tests/ts/wipefs/wipefs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/ts/wipefs/wipefs b/tests/ts/wipefs/wipefs index c79be0cc6d..e96f3717f0 100755 --- a/tests/ts/wipefs/wipefs +++ b/tests/ts/wipefs/wipefs @@ -7,25 +7,25 @@ TS_DESC="wipefs" ts_init "$*" ts_check_test_command "$TS_CMD_WIPEFS" +ts_check_test_command "$TS_CMD_MKMINIX" -ts_skip_nonroot +img="$(ts_image_init 50)" -# set global variable TS_DEVICE -ts_scsi_debug_init dev_size_mb=50 num_parts=2 +"$TS_CMD_MKMINIX" "$img" &>/dev/null # remove old backups -rm -rf $HOME/wipefs-$(basename ${TS_DEVICE})-*.bak +rm -rf $HOME/wipefs-$(basename ${img})-*.bak #remove the magic byte, back it up -$TS_CMD_WIPEFS --all --backup ${TS_DEVICE} &>/dev/null || ts_die "wipefs failed" +$TS_CMD_WIPEFS --all --backup ${img} &>/dev/null || ts_die "wipefs failed" #there should be just one magic string/backup file in this case -INFILE=$(ls $HOME/wipefs-$(basename ${TS_DEVICE})-*.bak) +INFILE=$(ls $HOME/wipefs-$(basename ${img})-*.bak) OFFT=$(echo $INFILE | sed 's/^.*-\(.*\).bak$/\1/') -dd if=$INFILE of=$TS_DEVICE bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null +dd if=$INFILE of=$img bs=1 conv=notrunc seek=$(($OFFT)) &>/dev/null #the bytes should be copied back, check if wipefs can recognize it -$TS_CMD_WIPEFS -a ${TS_DEVICE} > $TS_OUTDIR/out 2>/dev/null +$TS_CMD_WIPEFS -a ${img} > $TS_OUTDIR/out 2>/dev/null # check for output [ -s $TS_OUTDIR/out ] && echo "OK" &> $TS_OUTPUT || exit 1 -- 2.47.3