dmflakey: fix environment-destroying mistakes in _cleanup_flakey

[xfstests-dev.git] / common / dmflakey

diff --git a/common/dmflakey b/common/dmflakey
index af4371a3ca34995001d558fbee71e32f7f2f6d80..52da3b100fbe453bd6bbab711da466e5d9f32edc 100644 (file)
--- a/common/dmflakey
+++ b/common/dmflakey
@@ -84,11 +84,15 @@ _cleanup_flakey()
        test -n "$NON_FLAKEY_LOGDEV" && _dmsetup_remove flakey-logtest
        test -n "$NON_FLAKEY_RTDEV" && _dmsetup_remove flakey-rttest
 
-       SCRATCH_LOGDEV="$NON_FLAKEY_LOGDEV"
-       unset NON_FLAKEY_LOGDEV
+       if [ -n "$NON_FLAKEY_LOGDEV" ]; then
+               SCRATCH_LOGDEV="$NON_FLAKEY_LOGDEV"
+               unset NON_FLAKEY_LOGDEV
+       fi
 
-       SCRATCH_RTDEV="$NON_FLAKEY_RTDEV"
-       unset NON_FLAKEY_RTDEV
+       if [ -n "$NON_FLAKEY_RTDEV" ]; then
+               SCRATCH_RTDEV="$NON_FLAKEY_RTDEV"
+               unset NON_FLAKEY_RTDEV
+       fi
 }
 
 # _load_flakey_table <table> [lockfs]