[pve-devel] [PATCH installer] zfs: create /var/lib/vz only for PVE

[pve-devel] [PATCH installer] zfs: create /var/lib/vz only for PVE

[Stoiko Ivanov]

the recent patch to create /var/lib/vz as dedicated dataset, did so
for all our products - but this is only needed/wanted for PVE

moved the creation of the root-dataset above the creation of
rpool/data, so that the pve-specifics can remain in one if block.

Fixes: dd19d40ceac179ba18652f1d6c3e4c23f246af00
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
sending as separate patch in place of the v2 for the installer-glitches,
because I forgot to pull before sending the v2

 Proxmox/Install.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 4045a97..1a4ee93 100644
--- a/Proxmox/Install.pm
+++ b/Proxmox/Install.pm
@@ -182,15 +182,14 @@ sub zfs_create_rpool {
 
     syscmd("zfs create $pool_name/ROOT")  == 0 || die "unable to create zfs $pool_name/ROOT volume\n";
 
-    if ($iso_env->{product} eq 'pve') {
-	syscmd("zfs create $pool_name/data")  == 0 || die "unable to create zfs $pool_name/data volume\n";
-    }
-
     syscmd("zfs create $pool_name/ROOT/$root_volume_name")  == 0 ||
 	die "unable to create zfs $pool_name/ROOT/$root_volume_name volume\n";
 
-    syscmd("zfs create -p $pool_name/ROOT/$root_volume_name/var/lib/vz")  == 0 ||
-	die "unable to create zfs $pool_name/ROOT/$root_volume_name/var/lib/vz volume\n";
+    if ($iso_env->{product} eq 'pve') {
+	syscmd("zfs create $pool_name/data")  == 0 || die "unable to create zfs $pool_name/data volume\n";
+	syscmd("zfs create -p $pool_name/ROOT/$root_volume_name/var/lib/vz")  == 0 ||
+	    die "unable to create zfs $pool_name/ROOT/$root_volume_name/var/lib/vz volume\n";
+    }
 
     # default to `relatime` on, fast enough for the installer and production
     syscmd("zfs set atime=on relatime=on $pool_name") == 0 || die "unable to set zfs properties\n";
-- 
2.39.2

[pve-devel] applied: [PATCH installer] zfs: create /var/lib/vz only for PVE

[Thomas Lamprecht]

Am 16/11/2023 um 18:12 schrieb Stoiko Ivanov:
> the recent patch to create /var/lib/vz as dedicated dataset, did so
> for all our products - but this is only needed/wanted for PVE
> 
> moved the creation of the root-dataset above the creation of
> rpool/data, so that the pve-specifics can remain in one if block.
> 
> Fixes: dd19d40ceac179ba18652f1d6c3e4c23f246af00
> Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
> ---
> sending as separate patch in place of the v2 for the installer-glitches,
> because I forgot to pull before sending the v2
> 
>  Proxmox/Install.pm | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
> 
>

applied, thanks!