twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-11-11 20:43:42 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: Simplify conditional checks (#1016)

Browse Source
This commit is contained in:
Kroese
2025-09-21 15:09:52 +02:00
committed by GitHub
parent 1ca55cad8f
commit 6883efb857
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/disk.sh
View File

@@ -596,16 +596,16 @@ DISK4_FILE="/storage4/${DISK_NAME}4"
: "${DEVICE3:=""}"
: "${DEVICE4:=""}"
[ -z "$DEVICE" ] && [ -b "/disk" ] && DEVICE="/disk"
[ -z "$DEVICE" ] && [ -b "/disk1" ] && DEVICE="/disk1"
[ -z "$DEVICE2" ] && [ -b "/disk2" ] && DEVICE2="/disk2"
[ -z "$DEVICE3" ] && [ -b "/disk3" ] && DEVICE3="/disk3"
[ -z "$DEVICE4" ] && [ -b "/disk4" ] && DEVICE4="/disk4"
[ -z "$DEVICE" && -b "/disk" ] && DEVICE="/disk"
[ -z "$DEVICE" && -b "/disk1" ] && DEVICE="/disk1"
[ -z "$DEVICE2" && -b "/disk2" ] && DEVICE2="/disk2"
[ -z "$DEVICE3" && -b "/disk3" ] && DEVICE3="/disk3"
[ -z "$DEVICE4" && -b "/disk4" ] && DEVICE4="/disk4"
[ -z "$DEVICE" ] && [ -b "/dev/disk1" ] && DEVICE="/dev/disk1"
[ -z "$DEVICE2" ] && [ -b "/dev/disk2" ] && DEVICE2="/dev/disk2"
[ -z "$DEVICE3" ] && [ -b "/dev/disk3" ] && DEVICE3="/dev/disk3"
[ -z "$DEVICE4" ] && [ -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
[ -z "$DEVICE" && -b "/dev/disk1" ] && DEVICE="/dev/disk1"
[ -z "$DEVICE2" && -b "/dev/disk2" ] && DEVICE2="/dev/disk2"
[ -z "$DEVICE3" && -b "/dev/disk3" ] && DEVICE3="/dev/disk3"
[ -z "$DEVICE4" && -b "/dev/disk4" ] && DEVICE4="/dev/disk4"
if [ -n "$DEVICE" ]; then
addDevice "$DEVICE" "$DISK_TYPE" "3" "0xc" || exit $?