From 164456055c47f7489adc393339bf9029058696c3 Mon Sep 17 00:00:00 2001 From: Maarten den Braber Date: Wed, 7 Jul 2021 20:53:25 +0200 Subject: [PATCH 1/2] Change ubuntu to debian --- hetzner-debian10-zfs-setup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh index fc8ff41..e243aa9 100644 --- a/hetzner-debian10-zfs-setup.sh +++ b/hetzner-debian10-zfs-setup.sh @@ -552,8 +552,8 @@ zfs create -o canmount=off -o mountpoint=none "$v_bpool_name/BOOT" zfs create -o canmount=noauto -o mountpoint=/ "$v_rpool_name/ROOT/debian" zfs mount "$v_rpool_name/ROOT/debian" -zfs create -o canmount=noauto -o mountpoint=/boot "$v_bpool_name/BOOT/ubuntu" -zfs mount "$v_bpool_name/BOOT/ubuntu" +zfs create -o canmount=noauto -o mountpoint=/boot "$v_bpool_name/BOOT/debian" +zfs mount "$v_bpool_name/BOOT/debian" zfs create "$v_rpool_name/home" zfs create -o mountpoint=/root "$v_rpool_name/home/root" @@ -824,8 +824,8 @@ else fi echo "======= setting mountpoints ==========" -chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/ubuntu" -chroot_execute "echo $v_bpool_name/BOOT/ubuntu /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab" +chroot_execute "zfs set mountpoint=legacy $v_bpool_name/BOOT/debian" +chroot_execute "echo $v_bpool_name/BOOT/debian /boot zfs nodev,relatime,x-systemd.requires=zfs-import-bpool.service 0 0 > /etc/fstab" chroot_execute "zfs set mountpoint=legacy $v_rpool_name/var/log" chroot_execute "echo $v_rpool_name/var/log /var/log zfs nodev,relatime 0 0 >> /etc/fstab" From f4b94795857900cda42ca6dad3f2d7758599b8ec Mon Sep 17 00:00:00 2001 From: Maarten den Braber Date: Thu, 8 Jul 2021 02:27:17 +0200 Subject: [PATCH 2/2] Add -d option to bpool import to prevent import from ZVOL devices (e.g. /dev/zd*) with bpool datasets --- hetzner-debian10-zfs-setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hetzner-debian10-zfs-setup.sh b/hetzner-debian10-zfs-setup.sh index e243aa9..2e06c32 100644 --- a/hetzner-debian10-zfs-setup.sh +++ b/hetzner-debian10-zfs-setup.sh @@ -734,7 +734,7 @@ Before=zfs-import-cache.service Type=oneshot RemainAfterExit=yes ExecStartPre=/bin/sh -c '[ -f /etc/zfs/zpool.cache ] && mv /etc/zfs/zpool.cache /etc/zfs/preboot_zpool.cache || true' -ExecStart=/sbin/zpool import -N -o cachefile=none $v_bpool_name +ExecStart=/sbin/zpool import -N -o cachefile=none -d /dev/disk/by-id $v_bpool_name ExecStartPost=/bin/sh -c '[ -f /etc/zfs/preboot_zpool.cache ] && mv /etc/zfs/preboot_zpool.cache /etc/zfs/zpool.cache || true' [Install]