From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH installer] zfs: create /var/lib/vz only for PVE
Date: Thu, 16 Nov 2023 18:12:26 +0100 [thread overview]
Message-ID: <20231116171226.1326256-1-s.ivanov@proxmox.com> (raw)
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
next reply other threads:[~2023-11-16 17:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-16 17:12 Stoiko Ivanov [this message]
2023-11-16 18:21 ` [pve-devel] applied: " Thomas Lamprecht
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231116171226.1326256-1-s.ivanov@proxmox.com \
--to=s.ivanov@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox