From e21ef74f11d00a9ebdbb6601a19c3febca87f982 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Thu, 30 Jun 2011 09:08:22 +0000 Subject: [PATCH] Use -f to remove device Since some test may leave devices in suspend mode which would require carefull order of resume operation - use '-f' to replace them with error targets For disable_dev - when 'error' target is used for open count - treat return code as ok (|| true) to avoid breaking futher test processing. --- test/lib/aux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/lib/aux.sh b/test/lib/aux.sh index b74ef76bd..0e4c90881 100644 --- a/test/lib/aux.sh +++ b/test/lib/aux.sh @@ -71,7 +71,7 @@ teardown_devs() { while dmsetup table | grep -q ^$PREFIX; do for s in `dmsetup info -c -o name --noheading | grep ^$PREFIX`; do umount -fl $DM_DEV_DIR/mapper/$s >& /dev/null || true - dmsetup remove $s >& /dev/null || true + dmsetup remove -f $s >& /dev/null || true done done finish_udev_transaction @@ -292,7 +292,7 @@ disable_dev() { init_udev_transaction for dev in "$@"; do - dmsetup remove -f $dev + dmsetup remove -f $dev || true done finish_udev_transaction -- 2.43.5