diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh index cb427e9..5715d6b 100644 --- a/hetzner-debian10-zfs-setup.sh +++ b/hetzner-debian10-zfs-setup.sh @@ -755,7 +755,7 @@ chroot_execute "grub-install ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/debian\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/debian\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -845,7 +845,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "zfs set canmount=noauto rpool" + chroot_execute "zfs set canmount=noauto $v_rpool_name" else initial_load_debian_zed_cache fi diff --git a/hetzner-debian11-zfs-setup.sh b/hetzner-debian11-zfs-setup.sh index ef89418..2726a69 100644 --- a/hetzner-debian11-zfs-setup.sh +++ b/hetzner-debian11-zfs-setup.sh @@ -760,7 +760,7 @@ chroot_execute "grub-install --recheck ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/debian\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/debian\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -842,7 +842,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "zfs set canmount=noauto rpool" + chroot_execute "zfs set canmount=noauto $v_rpool_name" else initial_load_debian_zed_cache fi diff --git a/hetzner-debian12-zfs-setup.sh b/hetzner-debian12-zfs-setup.sh index 955786b..c648c11 100644 --- a/hetzner-debian12-zfs-setup.sh +++ b/hetzner-debian12-zfs-setup.sh @@ -759,7 +759,7 @@ chroot_execute "grub-install --recheck ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/debian\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/debian\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -847,7 +847,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" if [[ $v_zfs_experimental == "1" ]]; then - chroot_execute "zfs set canmount=noauto rpool" + chroot_execute "zfs set canmount=noauto $v_rpool_name" else initial_load_debian_zed_cache fi diff --git a/hetzner-ubuntu18-zfs-setup.sh b/hetzner-ubuntu18-zfs-setup.sh index 8b97e00..2562910 100644 --- a/hetzner-ubuntu18-zfs-setup.sh +++ b/hetzner-ubuntu18-zfs-setup.sh @@ -741,7 +741,7 @@ chroot_execute "grub-install ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/ubuntu\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -819,7 +819,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" -chroot_execute "zfs set canmount=noauto rpool" +chroot_execute "zfs set canmount=noauto $v_rpool_name" echo "======= setting mountpoints ==========" chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu" diff --git a/hetzner-ubuntu20-zfs-setup.sh b/hetzner-ubuntu20-zfs-setup.sh index b77d2f3..40ada20 100644 --- a/hetzner-ubuntu20-zfs-setup.sh +++ b/hetzner-ubuntu20-zfs-setup.sh @@ -742,7 +742,7 @@ chroot_execute "grub-install ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/ubuntu\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -832,7 +832,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" -chroot_execute "zfs set canmount=noauto rpool" +chroot_execute "zfs set canmount=noauto $v_rpool_name" echo "======= setting mountpoints ==========" chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu" diff --git a/hetzner-ubuntu22-zfs-setup.sh b/hetzner-ubuntu22-zfs-setup.sh index e40eed7..6439b3a 100644 --- a/hetzner-ubuntu22-zfs-setup.sh +++ b/hetzner-ubuntu22-zfs-setup.sh @@ -742,7 +742,7 @@ chroot_execute "grub-install ${v_selected_disks[0]}" chroot_execute "sed -i 's/#GRUB_TERMINAL=console/GRUB_TERMINAL=console/g' /etc/default/grub" chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX_DEFAULT=.*|GRUB_CMDLINE_LINUX_DEFAULT=\"net.ifnames=0\"|' /etc/default/grub" -chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=rpool/ROOT/ubuntu\"|g' /etc/default/grub" +chroot_execute "sed -i 's|GRUB_CMDLINE_LINUX=\"\"|GRUB_CMDLINE_LINUX=\"root=ZFS=$v_rpool_name/ROOT/ubuntu\"|g' /etc/default/grub" chroot_execute "sed -i 's/quiet//g' /etc/default/grub" chroot_execute "sed -i 's/splash//g' /etc/default/grub" @@ -821,7 +821,7 @@ chroot_execute "update-grub" echo "======= setting up zed ==========" -chroot_execute "zfs set canmount=noauto rpool" +chroot_execute "zfs set canmount=noauto $v_rpool_name" echo "======= setting mountpoints ==========" chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu"