Skip to content

Commit

Permalink
daemon/common_functions.sh: fix shell lint
Browse files Browse the repository at this point in the history
- SC2086
- SC2207
- SC2231

Signed-off-by: Dimitri Savineau <[email protected]>
(cherry picked from commit 8914ffc)
  • Loading branch information
dsavineau committed Nov 4, 2021
1 parent 5b3dcfc commit bc53469
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/daemon/common_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ function dev_part {
symdir=$(dirname "${osd_device}")
local link=""
local pfxlen=0
for option in ${symdir}/*; do
for option in "${symdir}"/*; do
[[ -e $option ]] || break
if [[ $(readlink -f "$option") == "$desired_partition" ]]; then
local optprefixlen
Expand Down Expand Up @@ -274,7 +274,7 @@ function apply_ceph_ownership_to_disks {
fi
fi
if [[ ${OSD_BLUESTORE} -eq 1 ]]; then
dev_real_path=($(resolve_symlink "$OSD_BLUESTORE_BLOCK_WAL" "$OSD_BLUESTORE_BLOCK_DB"))
mapfile -t dev_real_path < <(resolve_symlink "$OSD_BLUESTORE_BLOCK_WAL" "$OSD_BLUESTORE_BLOCK_DB")
for partition in $(list_dev_partitions "$OSD_DEVICE" "${dev_real_path[@]}"); do
part_code=$(get_part_typecode "$partition")
if [[ "$part_code" == "5ce17fce-4087-4169-b7ff-056cc58472be" ||
Expand Down Expand Up @@ -610,6 +610,6 @@ function dmcrypt_data_map() {
fi
LOCKBOX_UUID=$(get_part_uuid "${LOCKBOX_PART}")
mount_lockbox "${DATA_UUID}" "${LOCKBOX_UUID}"
ceph-disk --setuser ceph --setgroup disk activate --dmcrypt --no-start-daemon ${DATA_PART} || true
ceph-disk --setuser ceph --setgroup disk activate --dmcrypt --no-start-daemon "${DATA_PART}" || true
done
}

0 comments on commit bc53469

Please sign in to comment.