zfs: create /var/lib/vz only for PVE

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>

diff --git a/Proxmox/Install.pm b/Proxmox/Install.pm
index 4045a9775c880fde39a71b69e6cb11cf5698bdeb..1a4ee93ef11b3aa0d066c9dc8e519230d1a1f48a 100644 (file)
--- 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";