mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-11 19:00:02 +01:00
Fix error output redirection in tests.
git-svn-id: https://cryptsetup.googlecode.com/svn/trunk@439 36d66b0a-2a48-0410-832c-cd162a569da5
This commit is contained in:
@@ -5,8 +5,8 @@ DEV=""
|
|||||||
DEV_STACKED="luks0xbabe"
|
DEV_STACKED="luks0xbabe"
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
udevadm settle 2>/dev/null 2>&1
|
udevadm settle >/dev/null 2>&1
|
||||||
[ -b /dev/mapper/$DEV_STACKED ] && dmsetup remove $DEV_STACKED 2>/dev/null 2>&1
|
[ -b /dev/mapper/$DEV_STACKED ] && dmsetup remove $DEV_STACKED >/dev/null 2>&1
|
||||||
rmmod scsi_debug 2>/dev/null
|
rmmod scsi_debug 2>/dev/null
|
||||||
sleep 2
|
sleep 2
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ KEYv3=key_v3
|
|||||||
LOOPDEV=$(losetup -f 2>/dev/null)
|
LOOPDEV=$(losetup -f 2>/dev/null)
|
||||||
|
|
||||||
function dmremove() { # device
|
function dmremove() { # device
|
||||||
udevadm settle 2>/dev/null 2>&1
|
udevadm settle >/dev/null 2>&1
|
||||||
dmsetup remove $1 2>/dev/null 2>&1
|
dmsetup remove $1 >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
function remove_mapping()
|
function remove_mapping()
|
||||||
|
|||||||
@@ -15,8 +15,8 @@ IVMODES="null benbi plain plain64 essiv:sha256"
|
|||||||
LOOPDEV=$(losetup -f 2>/dev/null)
|
LOOPDEV=$(losetup -f 2>/dev/null)
|
||||||
|
|
||||||
dmremove() { # device
|
dmremove() { # device
|
||||||
udevadm settle 2>/dev/null 2>&1
|
udevadm settle >/dev/null 2>&1
|
||||||
dmsetup remove $1 2>/dev/null 2>&1
|
dmsetup remove $1 >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ KEY_FILE=keyfile
|
|||||||
DEV2=$DEV_NAME"_x"
|
DEV2=$DEV_NAME"_x"
|
||||||
|
|
||||||
dmremove() { # device
|
dmremove() { # device
|
||||||
udevadm settle 2>/dev/null 2>&1
|
udevadm settle >/dev/null 2>&1
|
||||||
dmsetup remove $1 2>/dev/null 2>&1
|
dmsetup remove $1 >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
cleanup() {
|
cleanup() {
|
||||||
|
|||||||
Reference in New Issue
Block a user