Skip to content

fix: guard raid setup and fix file share over-removal #2182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrv777 wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −1
Open

fix: guard raid setup and fix file share over-removal #2182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5af314
fix: guard against wiping raid array and over-removing file shares
mrv777 Jun 30, 2026
ae0d66b
fix: normalize path in delete so share cleanup handles trailing slashes
mrv777 Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/umbreld/source/modules/files/files.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,6 +680,8 @@ export default class Files {

// Permanently delete a file or directory
async delete(virtualPath: string) {
virtualPath = normalizePath(virtualPath)

// Check if operation is allowed
const allowedOperations = await this.getAllowedOperations(virtualPath)
if (!allowedOperations.includes('delete')) throw new Error('[operation-not-allowed]')
Expand All @@ -692,7 +694,8 @@ export default class Files {
if (virtualPath.startsWith('/External/')) {
const shares = (await this.#umbreld.store.get('files.shares')) || []
for (const share of shares) {
if (share.path.startsWith(virtualPath)) await this.samba.removeShare(share.path)
if (share.path === virtualPath || share.path.startsWith(`${virtualPath}/`))
await this.samba.removeShare(share.path)
}
}

Expand Down
4 changes: 4 additions & 0 deletions packages/umbreld/source/modules/hardware/raid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -923,6 +923,10 @@ export default class Raid {
if (deviceIds.length === 0) throw new Error('At least one device is required')
if (raidType === 'failsafe' && deviceIds.length < 2) throw new Error('Failsafe mode requires at least two devices')

// Don't wipe an existing array. setup() partitions the devices and creates a
// fresh pool, so running it again would destroy the live array.
if ((await this.getStatus()).exists) throw new Error('A RAID array already exists')

const devices = deviceIds.map((id) => `/dev/disk/by-umbrel-id/${id}`)
for (const device of devices) {
if (!(await fse.pathExists(device))) throw new Error(`Device not found: ${device}`)
Expand Down