jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

First attempt a temporary mountpoint

Browse Source
This commit is contained in:
Johannes Zellner
2023-09-28 10:38:52 +02:00
parent 8426b11a90
commit 8d0abf214c
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/mounts.js
View File

@@ -195,6 +195,20 @@ async function tryAddMount(mount, options) {
if (constants.TEST) return;
// first try to mount at /mnt/volumes/<volumeId>-attempt
const originalHostPath = mount.hostPath;
mount.hostPath = originalHostPath + '-attempt';
const [attemptError] = await safe(shell.promises.sudo('addMount', [ ADD_MOUNT_CMD, renderMountFile(mount), options.timeout ], {}));
if (attemptError && attemptError.code === 2) throw new BoxError(BoxError.MOUNT_ERROR, 'Failed to unmount existing mount'); // at this point, the old mount config is still there
const attemptStatus = await getStatus(mount.mountType, mount.hostPath);
await removeMount(mount);
if (attemptStatus.state !== 'active') throw new BoxError(BoxError.MOUNT_ERROR, `Failed to mount (${attemptStatus.state}): ${attemptStatus.message}`);
// now create the real mount
mount.hostPath = originalHostPath;
const [error] = await safe(shell.promises.sudo('addMount', [ ADD_MOUNT_CMD, renderMountFile(mount), options.timeout ], {}));
if (error && error.code === 2) throw new BoxError(BoxError.MOUNT_ERROR, 'Failed to unmount existing mount'); // at this point, the old mount config is still there