blkdeactivate: fix regression in blkdeactivate causing dm and md devices to be skipped.

Commit #5b3a4a9 caused the "name" variable to be cleared if
declaration and assignment is on two lines so put it back
so it's on one line for it to work again.

diff --git a/WHATS_NEW b/WHATS_NEW
index c1b90af1317f3ab7a2ed5f9541201a35f776d76d..2e7e138560b48c55d5bd19faa0a36ad19bfe34f7 100644 (file)
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.156 - 
 ================================
+  Fix regression in blkdeactivate causing dm and md devices to be skipped. (2.02.155)
 
 Version 2.02.155 - 3rd June 2016
 ================================

diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
index 2a48b3e0f2a0180878ded5a957882313bd6e2707..b4c3237eff22c9874371b43aa66ebf676b6e36b1 100644 (file)
--- a/scripts/blkdeactivate.sh.in
+++ b/scripts/blkdeactivate.sh.in
@@ -193,8 +193,7 @@ deactivate_holders () {
 }
 
 deactivate_dm () {
-       local name
-       name=$(printf "%s" "$name")
+       local name=$(printf "%s" "$name")
        test -b "$DEV_DIR/mapper/$name" || return 0
        test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1
 
@@ -263,8 +262,7 @@ deactivate_lvm () {
 }
 
 deactivate_md () {
-       local name
-       name=$(printf "%s" "$name")
+       local name=$(printf "%s" "$name")
        test -b "$DEV_DIR/$name" || return 0
        test -z ${SKIP_DEVICE_LIST["$kname"]} || return 1