diff options
| author | Peter Rajnoha <prajnoha@redhat.com> | 2016-06-06 14:57:41 +0200 |
|---|---|---|
| committer | Peter Rajnoha <prajnoha@redhat.com> | 2016-06-06 14:57:46 +0200 |
| commit | 7ae05adf462b8de4428f32600fb43583dce5009a (patch) | |
| tree | 97abf57554c43eaf37afe0225c84645113ec559e /scripts | |
| parent | 7c894911aee47662e8f85f4458d65baea97eb058 (diff) | |
| download | lvm2-7ae05adf462b8de4428f32600fb43583dce5009a.tar.gz | |
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/blkdeactivate.sh.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in index 2a48b3e0f..b4c3237ef 100644 --- 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 |