From b2d072f2e6d3c8f1b39842c11b70f29ed2cb1231 Mon Sep 17 00:00:00 2001 From: Girish Ramakrishnan Date: Tue, 24 Jan 2023 14:53:51 +0100 Subject: [PATCH] backups: always test the mount It's possible that the current credentials do not work. For example, CIFS is disabled in hetzner's control panel. In such cases, we skip the mount check and then fail later in some filesystem error. This misleads the user. https://forum.cloudron.io/topic/8391/cloudronbackup-folder-disappears-when-trying-to-restore --- src/settings.js | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/settings.js b/src/settings.js index 0c3417c3d..a25298d18 100644 --- a/src/settings.js +++ b/src/settings.js @@ -416,12 +416,6 @@ async function getBackupConfig() { return backupConfig; } -function mountOptionsChanged(currentConfig, backupConfig) { - return currentConfig.provider !== backupConfig.provider - || currentConfig.mountPoint !== backupConfig.mountPoint - || !_.isEqual(currentConfig.mountOptions, backupConfig.mountOptions); -} - async function setBackupConfig(backupConfig) { assert.strictEqual(typeof backupConfig, 'object'); @@ -429,7 +423,7 @@ async function setBackupConfig(backupConfig) { backups.injectPrivateFields(backupConfig, oldConfig); - if (mounts.isManagedProvider(backupConfig.provider) && (!mounts.isManagedProvider(oldConfig.provider) || mountOptionsChanged(oldConfig, backupConfig))) { + if (mounts.isManagedProvider(backupConfig.provider)) { let error = mounts.validateMountOptions(backupConfig.provider, backupConfig.mountOptions); if (error) throw error;