From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 821361FF15D for ; Thu, 17 Oct 2024 13:51:38 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E5A11E9D0; Thu, 17 Oct 2024 13:52:08 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Thu, 17 Oct 2024 13:51:22 +0200 Message-Id: <20241017115124.75539-2-d.kral@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241017115124.75539-1-d.kral@proxmox.com> References: <20241017115124.75539-1-d.kral@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.001 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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 qemu-server 2/4] importdisk: convert imported volume disks to base images for templates 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: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" Automatically converts any imported volume disk to a base volume image if the VM is a template and the volume was imported using the "target-disk" option, as "unused" disks are not needed to be converted as they won't be cloned with either linked nor full clones. Signed-off-by: Daniel Kral --- Notes: Change to the command line output There is a small change to the console output at the end, because (a) it produces less code than correctly setting the $drive_id and $volid again, and (b) it is more consistent with the console prints of `create_disks` used when creating new VM disks. PVE/CLI/qm.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm index 30282f6f..e65684bd 100755 --- a/PVE/CLI/qm.pm +++ b/PVE/CLI/qm.pm @@ -622,7 +622,13 @@ __PACKAGE__->register_method ({ format => $format, }); - print "Successfully imported disk as '$drive_id:$volid'\n"; + $vm_conf = PVE::QemuConfig->load_config($vmid); + + # change imported _used_ disk to a base volume in case the VM is a template + PVE::QemuServer::template_create($vmid, $vm_conf, $drive_id) + if is_valid_drivename($drive_id) && PVE::QemuConfig->is_template($vm_conf); + + print "$drive_id: successfully imported disk '$vm_conf->{$drive_id}'\n"; return; }}); -- 2.39.5 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel