macOS: also checkbashism

openzfs · Jun 9, 2021 · ecb2195 · ecb2195
1 parent ecbeb9f
commit ecb2195
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cmd/zed/zed.d/zvol.create.sh b/cmd/zed/zed.d/zvol.create.sh
@@ -12,7 +12,7 @@
 
 ZVOL_ROOT="/var/run/zfs/zvol"
 
-mkdir -p "$(dirname "${ZVOL_ROOT}/{r,}dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")"
+mkdir -p "$(dirname "${ZVOL_ROOT}/rdsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")" "$(dirname "${ZVOL_ROOT}/dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")"
 
 # Remove them if they already exist. (ln -f is not portable)
 rm -f "${ZVOL_ROOT}/rdsk/${ZEVENT_POOL}/${ZEVENT_DATASET}" "${ZVOL_ROOT}/dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}"

diff --git a/cmd/zed/zed.d/zvol.remove.sh b/cmd/zed/zed.d/zvol.remove.sh
@@ -13,7 +13,7 @@
 ZVOL_ROOT="/var/run/zfs/zvol"
 
 rm -f "${ZVOL_ROOT}/rdsk/${ZEVENT_POOL}/${ZEVENT_DATASET}" "${ZVOL_ROOT}/dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}"
-rmdir -p "$(dirname "${ZVOL_ROOT}/{r,}dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")"
+rmdir -p "$(dirname "${ZVOL_ROOT}/rdsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")" "$(dirname "${ZVOL_ROOT}/dsk/${ZEVENT_POOL}/${ZEVENT_DATASET}")"
 
 logger -t "${ZED_SYSLOG_TAG:=zed}" -p "${ZED_SYSLOG_PRIORITY:=daemon.notice}" \
 	eid="${ZEVENT_EID}" class="${ZEVENT_SUBCLASS}" \