From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D155C1FF13E for ; Fri, 23 Jan 2026 15:35:38 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E57AAFEC5; Fri, 23 Jan 2026 15:35:33 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 23 Jan 2026 15:34:28 +0100 Message-ID: <20260123143454.150800-9-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123143454.150800-1-f.ebner@proxmox.com> References: <20260123143454.150800-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1769178839340 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.165 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 POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_2 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_4 0.1 random spam to be learned in bayes 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 manager v3 8/8] ui: restore: enable safeguarding of mount point volumes by default 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" Same rationale as in pve-manager commit 5f855ccf ("ui: restore: improve warning for restoring container with same ID"): it's surprising to (new) users that all owned mount point volumes are erased upon container restore, even those that are not currently selected for backup. This is different from VM restore, where volumes attached at drives not present in the backup will be kept around as unused volumes. Opt-in by default to the new option to change this behavior. Remove the special message printed regarding removal of mount point volumes to avoid confusion/complexity. With the checkbox for safeguarding being present, attention is already directed towards this behavior. And since the checkbox is enabled by default, one needs to explicitly opt-out for not backed-up mount points. For backed-up mount points, it should be clear that they are overwritten by the restore, since the confirm dialog already states "This will permanently erase current CT data". Signed-off-by: Fiona Ebner --- Changes in v3: * Slightly improve tooltip. NOTE: dependency bump for pve-container is needed! NOTE: better viewed as a word-based diff www/manager6/window/Restore.js | 98 ++++++++++++++++++++-------------- 1 file changed, 58 insertions(+), 40 deletions(-) diff --git a/www/manager6/window/Restore.js b/www/manager6/window/Restore.js index e8d8de4e..841a5db8 100644 --- a/www/manager6/window/Restore.js +++ b/www/manager6/window/Restore.js @@ -50,6 +50,9 @@ Ext.define('PVE.window.Restore', { if (values.storage) { params.storage = values.storage; } + if (values['restore-safeguard-mp-volumes']) { + params['restore-safeguard-mp-volumes'] = 1; + } ['bwlimit', 'cores', 'name', 'memory', 'sockets'].forEach((opt) => { if ((values[opt] ?? '') !== '') { @@ -98,7 +101,6 @@ Ext.define('PVE.window.Restore', { if (view.vmid) { if (view.vmtype === 'lxc') { confirmMsg += `. ${gettext('This will permanently erase current CT data.')}`; - confirmMsg += `
${gettext('Mount point volumes are also erased.')}`; } else { confirmMsg += `. ${gettext('This will permanently erase current VM data.')}`; } @@ -256,47 +258,63 @@ Ext.define('PVE.window.Restore', { ]; if (me.vmtype === 'lxc') { - items.push({ - xtype: 'radiogroup', - fieldLabel: gettext('Privilege Level'), - reference: 'noVNCScalingGroup', - height: '15px', // renders faster with value assigned - layout: { - type: 'hbox', - algin: 'stretch', + items.push( + { + xtype: 'radiogroup', + fieldLabel: gettext('Privilege Level'), + reference: 'noVNCScalingGroup', + height: '15px', // renders faster with value assigned + layout: { + type: 'hbox', + algin: 'stretch', + }, + autoEl: { + tag: 'div', + 'data-qtip': gettext( + 'Choose if you want to keep or override the privilege level of the restored Container.', + ), + }, + items: [ + { + xtype: 'radiofield', + name: 'unprivileged', + inputValue: 'keep', + boxLabel: gettext('From Backup'), + flex: 1, + checked: true, + }, + { + xtype: 'radiofield', + name: 'unprivileged', + inputValue: '1', + boxLabel: gettext('Unprivileged'), + flex: 1, + }, + { + xtype: 'radiofield', + name: 'unprivileged', + inputValue: '0', + boxLabel: gettext('Privileged'), + flex: 1, + //margin: '0 0 0 10', + }, + ], }, - autoEl: { - tag: 'div', - 'data-qtip': gettext( - 'Choose if you want to keep or override the privilege level of the restored Container.', - ), + { + xtype: 'proxmoxcheckbox', + name: 'restore-safeguard-mp-volumes', + itemId: 'restoreSafeguardMpVolumes', + fieldLabel: gettext('Safeguard Mount Point Volumes'), + flex: 1, + checked: true, + autoEl: { + tag: 'div', + 'data-qtip': gettext( + "Preserve mount point volumes that are not included in the backup as 'Unused Disk' entries.", + ), + }, }, - items: [ - { - xtype: 'radiofield', - name: 'unprivileged', - inputValue: 'keep', - boxLabel: gettext('From Backup'), - flex: 1, - checked: true, - }, - { - xtype: 'radiofield', - name: 'unprivileged', - inputValue: '1', - boxLabel: gettext('Unprivileged'), - flex: 1, - }, - { - xtype: 'radiofield', - name: 'unprivileged', - inputValue: '0', - boxLabel: gettext('Privileged'), - flex: 1, - //margin: '0 0 0 10', - }, - ], - }); + ); } else if (me.vmtype === 'qemu') { items.push( { -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel