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 <[email protected]> --- 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 += `<br>${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 [email protected] https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
