Browse code

Merge "run tgt-admin --delete only if input not empty"

Jenkins authored on 2016/04/01 08:12:25
Showing 1 changed files
... ...
@@ -124,7 +124,7 @@ function init_lvm_volume_group {
124 124
     if [ "$CINDER_ISCSI_HELPER" = "lioadm" ]; then
125 125
         sudo cinder-rtstool get-targets | sudo xargs -rn 1 cinder-rtstool delete
126 126
     else
127
-        sudo tgtadm --op show --mode target | grep Target | cut -f3 -d ' ' | sudo xargs -n1 tgt-admin --delete || true
127
+        sudo tgtadm --op show --mode target | awk '/Target/ {print $3}' | sudo xargs -r -n1 tgt-admin --delete
128 128
     fi
129 129
     _clean_lvm_volume_group $vg
130 130
 }