From dc72f24c43bbf25219162a641ed7155f9be0a0f7 Mon Sep 17 00:00:00 2001 From: Prokopenko Andrey Date: Thu, 25 Nov 2021 23:37:05 +0100 Subject: [PATCH] removed double quoting from zpool statements --- hetzner-debian10-zfs-setup.sh | 8 +++++--- hetzner-ubuntu18-zfs-setup.sh | 10 ++++++---- hetzner-ubuntu20-zfs-setup.sh | 10 ++++++---- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh index c7f596d..8abeb80 100644 --- a/hetzner-debian10-zfs-setup.sh +++ b/hetzner-debian10-zfs-setup.sh @@ -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" diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh index 85c69fe..69d70fa 100644 --- a/hetzner-ubuntu18-zfs-setup.sh +++ b/hetzner-ubuntu18-zfs-setup.sh @@ -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" diff --git a/hetzner-ubuntu20-zfs-setup.sh b/hetzner-ubuntu20-zfs-setup.sh index f4fb95b..89b592f 100644 --- a/hetzner-ubuntu20-zfs-setup.sh +++ b/hetzner-ubuntu20-zfs-setup.sh @@ -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"