From 0059c29eb6c3f29dff9946fa9bf860e495ef3433 Mon Sep 17 00:00:00 2001 From: "Ruben S. Montero" Date: Mon, 4 Feb 2019 16:43:29 +0100 Subject: [PATCH] F #2885: Check with yes for zero'ing attributes --- src/tm_mad/fs_lvm/clone | 2 +- src/tm_mad/fs_lvm/delete | 2 +- src/tm_mad/fs_lvm/resize | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/tm_mad/fs_lvm/clone b/src/tm_mad/fs_lvm/clone index 55a86dabe1..d4614d6175 100755 --- a/src/tm_mad/fs_lvm/clone +++ b/src/tm_mad/fs_lvm/clone @@ -130,7 +130,7 @@ CLONE_CMD=$(cat <"${DST_DIR}/.host" || : # zero trailing space - if [ -n "${ZERO_LVM_ON_CREATE}" ]; then + if [ "${ZERO_LVM_ON_CREATE}" = "yes" ]; then LVSIZE=\$(${SUDO} ${LVS} --nosuffix --noheadings --units B -o lv_size "${DEV}" | tr -d '[:blank:]') ${DD} if=/dev/zero of="${DEV}" bs=64k \ oflag=seek_bytes iflag=count_bytes \ diff --git a/src/tm_mad/fs_lvm/delete b/src/tm_mad/fs_lvm/delete index d0d1918899..70075ee183 100755 --- a/src/tm_mad/fs_lvm/delete +++ b/src/tm_mad/fs_lvm/delete @@ -78,7 +78,7 @@ EOF if [ -n "${DS_SYS_ID}" ]; then - if [ -n "${ZERO_LVM_ON_DELETE}" ]; then + if [ "${ZERO_LVM_ON_DELETE}" = "yes" ]; then ssh_exec_and_log "$DST_HOST" "$ZERO_CMD" "Error cleaning $DST_PATH" fi diff --git a/src/tm_mad/fs_lvm/resize b/src/tm_mad/fs_lvm/resize index b152cdfb37..6b7fb95b20 100755 --- a/src/tm_mad/fs_lvm/resize +++ b/src/tm_mad/fs_lvm/resize @@ -59,7 +59,7 @@ VG_NAME="vg-one-$DS_SYS_ID" DEV="/dev/${VG_NAME}/${LV_NAME}" # Get current LV size -if [ -n "${ZERO_LVM_ON_CREATE}" ]; then +if [ "${ZERO_LVM_ON_CREATE}" = "yes" ]; then LVSIZE_CMD=$(cat <