mountPoint is only set for 'mountpoint' (unmanaged)

When restoring, mountPoint field is expected for managed mount points
This commit is contained in:
Girish Ramakrishnan
2022-01-26 12:59:34 -08:00
parent 8b9d821905
commit a786fad3ee
6 changed files with 17 additions and 11 deletions
+3 -2
View File
@@ -401,7 +401,9 @@ async function getBackupConfig() {
const backupConfig = JSON.parse(value); // provider, token, password, region, prefix, bucket
if (backupConfig.provider === 'sshfs' || backupConfig.provider === 'cifs' || backupConfig.provider === 'nfs' || backupConfig.provider === 'ext4' || backupConfig.provider === 'mountpoint') {
if (mounts.isManagedProvider(backupConfig.provider)) {
backupConfig.mountStatus = await mounts.getStatus(backupConfig.provider, paths.MANAGED_BACKUP_MOUNT_DIR); // { state, message }
} else if (backupConfig.provider === 'mountpoint') {
backupConfig.mountStatus = await mounts.getStatus(backupConfig.provider, backupConfig.mountPoint); // { state, message }
}
@@ -422,7 +424,6 @@ async function setBackupConfig(backupConfig) {
backups.injectPrivateFields(backupConfig, oldConfig);
if (mounts.isManagedProvider(backupConfig.provider) && (!mounts.isManagedProvider(oldConfig.provider) || mountOptionsChanged(oldConfig, backupConfig))) {
backupConfig.mountPoint = '/mnt/cloudronbackup'; // hardcode the mountPoint for built-in mounts
let error = mounts.validateMountOptions(backupConfig.provider, backupConfig.mountOptions);
if (error) throw error;