Skip to content

Commit

Permalink
removed double quoting from zpool statements
Browse files Browse the repository at this point in the history
  • Loading branch information
Prokopenko Andrey committed Nov 25, 2021
1 parent f2331df commit dc72f24
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
8 changes: 5 additions & 3 deletions hetzner-debian10-zfs-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -541,18 +541,20 @@ echo "======= create zfs pools and datasets =========="
pools_mirror_option=
fi

# shellcheck disable=SC2086
zpool create \
"$v_bpool_tweaks" -O canmount=off -O devices=off \
-o cachefile=/etc/zfs/zpool.cache \
-O mountpoint=/boot -R $c_zfs_mount_dir -f \
"$v_bpool_name" "$pools_mirror_option" "${bpool_disks_partitions[@]}"
$v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"

# shellcheck disable=SC2086
echo -n "$v_passphrase" | zpool create \
-o cachefile=/etc/zfs/zpool.cache \
"$v_rpool_tweaks" \
$v_rpool_tweaks \
"${encryption_options[@]}" \
-O mountpoint=/ -R $c_zfs_mount_dir -f \
"$v_rpool_name $pools_mirror_option" "${rpool_disks_partitions[@]}"
$v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"

zfs create -o canmount=off -o mountpoint=none "$v_rpool_name/ROOT"
zfs create -o canmount=off -o mountpoint=none "$v_bpool_name/BOOT"
Expand Down
10 changes: 6 additions & 4 deletions hetzner-ubuntu18-zfs-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -509,18 +509,20 @@ echo "======= create zfs pools and datasets =========="
pools_mirror_option=
fi

# shellcheck disable=SC2086
zpool create \
"$v_bpool_tweaks" -O canmount=off -O devices=off \
$v_bpool_tweaks -O canmount=off -O devices=off \
-o cachefile=/etc/zfs/zpool.cache \
-O mountpoint=/boot -R $c_zfs_mount_dir -f \
"$v_bpool_name" "$pools_mirror_option" "${bpool_disks_partitions[@]}"
$v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"

# shellcheck disable=SC2086
echo -n "$v_passphrase" | zpool create \
"$v_rpool_tweaks" \
$v_rpool_tweaks \
-o cachefile=/etc/zfs/zpool.cache \
"${encryption_options[@]}" \
-O mountpoint=/ -R $c_zfs_mount_dir -f \
"$v_rpool_name" "$pools_mirror_option" "${rpool_disks_partitions[@]}"
$v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"

zfs create -o canmount=off -o mountpoint=none "$v_rpool_name/ROOT"
zfs create -o canmount=off -o mountpoint=none "$v_bpool_name/BOOT"
Expand Down
10 changes: 6 additions & 4 deletions hetzner-ubuntu20-zfs-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -509,18 +509,20 @@ echo "======= create zfs pools and datasets =========="
pools_mirror_option=
fi

# shellcheck disable=SC2086
zpool create \
"$v_bpool_tweaks" -O canmount=off -O devices=off \
$v_bpool_tweaks -O canmount=off -O devices=off \
-o cachefile=/etc/zfs/zpool.cache \
-O mountpoint=/boot -R $c_zfs_mount_dir -f \
"$v_bpool_name" "$pools_mirror_option" "${bpool_disks_partitions[@]}"
$v_bpool_name $pools_mirror_option "${bpool_disks_partitions[@]}"

# shellcheck disable=SC2086
echo -n "$v_passphrase" | zpool create \
"$v_rpool_tweaks" \
$v_rpool_tweaks \
-o cachefile=/etc/zfs/zpool.cache \
"${encryption_options[@]}" \
-O mountpoint=/ -R $c_zfs_mount_dir -f \
"$v_rpool_name" "$pools_mirror_option" "${rpool_disks_partitions[@]}"
$v_rpool_name $pools_mirror_option "${rpool_disks_partitions[@]}"

zfs create -o canmount=off -o mountpoint=none "$v_rpool_name/ROOT"
zfs create -o canmount=off -o mountpoint=none "$v_bpool_name/BOOT"
Expand Down

0 comments on commit dc72f24

Please sign in to comment.