From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 0F79199DC1
for <pve-devel@lists.proxmox.com>; Thu, 16 Nov 2023 18:12:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id E49411853F
for <pve-devel@lists.proxmox.com>; Thu, 16 Nov 2023 18:12:43 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[94.136.29.106])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Thu, 16 Nov 2023 18:12:43 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 11218433D4
for <pve-devel@lists.proxmox.com>; Thu, 16 Nov 2023 18:12:43 +0100 (CET)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Thu, 16 Nov 2023 18:12:26 +0100
Message-Id: <20231116171226.1326256-1-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.089 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DMARC_MISSING 0.1 Missing DMARC policy
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
T_SCC_BODY_TEXT_LINE -0.01 -
Subject: [pve-devel] [PATCH installer] zfs: create /var/lib/vz only for PVE
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Thu, 16 Nov 2023 17:12:44 -0000
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