tests: minor cleanup ts_fdisk_clean()

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>

diff --git a/tests/functions.sh b/tests/functions.sh
index 1f4d51878b72b19b57adaff3d2e99a6be716a0de..8f6c877249b10ee630fececa168fc930402bd978 100644 (file)
--- a/tests/functions.sh
+++ b/tests/functions.sh
@@ -610,18 +610,18 @@ function ts_fdisk_clean {
        local DEVNAME=$1
 
        # remove non comparable parts of fdisk output
-       if [ x"${DEVNAME}" != x"" ]; then
-               sed -i -e "s:${DEVNAME}:<removed>:g;" $TS_OUTPUT
-       fi
-
-       sed -i -e 's/Disk identifier:.*/Disk identifier: <removed>/g' \
-              -e 's/Created a new.*/Created a new <removed>./g' \
-              -e 's/^Device[[:blank:]]*Start/Device             Start/g' \
-              -e 's/^Device[[:blank:]]*Boot/Device     Boot/g' \
-              -e 's/^Device[[:blank:]]*Flag/Device     Flag/g' \
-              -e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./g' \
-              -e 's/typescript file.*/typescript file <removed>./g' \
-              $TS_OUTPUT
+       if [ -n "${DEVNAME}" ]; then
+               sed -i -e "s@${DEVNAME}@<removed>@;" $TS_OUTPUT
+       fi
+
+       sed -i \
+               -e 's/Disk identifier:.*/Disk identifier: <removed>/' \
+               -e 's/Created a new.*/Created a new <removed>./' \
+               -e 's/^Device[[:blank:]]*Start/Device             Start/' \
+               -e 's/^Device[[:blank:]]*Boot/Device     Boot/' \
+               -e 's/Welcome to fdisk.*/Welcome to fdisk <removed>./' \
+               -e 's/typescript file.*/typescript file <removed>./' \
+               $TS_OUTPUT
 }
 
 function ts_scsi_debug_init {