From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 38038733B8 for ; Thu, 27 May 2021 14:24:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 358151D8A2 for ; Thu, 27 May 2021 14:24:02 +0200 (CEST) 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 id 7EEF71D898 for ; Thu, 27 May 2021 14:24:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 291EB466B2 for ; Thu, 27 May 2021 14:24:01 +0200 (CEST) From: Lorenz Stechauner To: pve-devel@lists.proxmox.com Date: Thu, 27 May 2021 14:23:30 +0200 Message-Id: <20210527122331.86302-2-l.stechauner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210527122331.86302-1-l.stechauner@proxmox.com> References: <20210527122331.86302-1-l.stechauner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.322 Adjusted score from AWL reputation of From: address 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 Subject: [pve-devel] [PATCH v3 container 1/1] fix #3421: allow custom storage plugins to support rootfs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 May 2021 12:24:02 -0000 it is now necessary for storages to support the 'rootdir' content in order to start containers on them. all native storage plugins already report the rootdir content correctly. Signed-off-by: Lorenz Stechauner --- src/PVE/LXC.pm | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 7e6f378..556f7fa 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1682,15 +1682,16 @@ sub __mountpoint_mount { } }; my $use_loopdev = 0; - if ($scfg->{path}) { - $mounted_dev = run_with_loopdev($domount, $path, $readonly); - $use_loopdev = 1; - } elsif ($scfg->{type} eq 'drbd' || $scfg->{type} eq 'lvm' || - $scfg->{type} eq 'rbd' || $scfg->{type} eq 'lvmthin') { - $mounted_dev = $path; - &$domount($path); + if ($scfg->{content}->{rootdir}) { + if ($scfg->{path}) { + $mounted_dev = run_with_loopdev($domount, $path, $readonly); + $use_loopdev = 1; + } else { + $mounted_dev = $path; + &$domount($path); + } } else { - die "unsupported storage type '$scfg->{type}'\n"; + die "storage '$storage' does not support containers\n"; } return wantarray ? ($path, $use_loopdev, $mounted_dev) : $path; } else { @@ -1871,7 +1872,7 @@ sub alloc_disk { eval { my $do_format = 0; - if ($scfg->{type} eq 'dir' || $scfg->{type} eq 'nfs' || $scfg->{type} eq 'cifs' ) { + if ($scfg->{content}->{rootdir} && $scfg->{path}) { if ($size_kb > 0) { $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size_kb); @@ -1882,21 +1883,14 @@ sub alloc_disk { $needs_chown = 1; } } elsif ($scfg->{type} eq 'zfspool') { - $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'subvol', undef, $size_kb); $needs_chown = 1; - } elsif ($scfg->{type} eq 'drbd' || $scfg->{type} eq 'lvm' || $scfg->{type} eq 'lvmthin') { - - $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size_kb); - $do_format = 1; - - } elsif ($scfg->{type} eq 'rbd') { - + } elsif ($scfg->{content}->{rootdir}) { $volid = PVE::Storage::vdisk_alloc($storecfg, $storage, $vmid, 'raw', undef, $size_kb); $do_format = 1; } else { - die "unable to create containers on storage type '$scfg->{type}'\n"; + die "storage '$storage' does not support containers\n"; } format_disk($storecfg, $volid, $rootuid, $rootgid) if $do_format; }; -- 2.20.1