mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-11-21 07:26:18 -05:00
Disks: allow persisting the primary mount from the UI; clean NTFS before mounting.
The Disks page treated /media/wrolpi as fully protected, so a manually-mounted primary drive could not be persisted from the UI — and the Persist toggle would have been wrong anyway: it wrote fstab.yaml, which the wrolpi-mounts reconciler refuses to apply for the primary mount (RESERVED_MOUNT_POINTS). Route Persist for the primary mount to the host's /etc/fstab (as onboarding does), report its entry in the fstab list endpoint, and enable the toggle in both UIs while keeping Unmount blocked. Mounts outside /media (e.g. /boot/efi, which showed an Unmount button) are now entirely untouchable System mounts. Also: - Run `ntfsfix -d` before mounting ntfs/ntfs3 volumes so the Windows dirty flag (Fast Startup, unclean unplug) cannot block mounting; non-fatal and a no-op on clean volumes. - Add uid/gid fstab options for ntfs/ntfs3, matching mount_drive(). - Log reconcile diagnostics (desired/already-mounted/skipped with reasons) so an idle wrolpi-mounts run explains itself in the journal. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
parent
85bd5619fa
commit
c25902b92a
11 changed files with 251 additions and 18 deletions
|
|
@ -647,8 +647,10 @@ function SmartDetailsModal({drive, open, onClose}) {
|
|||
}
|
||||
|
||||
|
||||
// Protected mount points that should not be unmounted
|
||||
const PROTECTED_MOUNTS = ['/', '/boot', '/boot/firmware', '/media/wrolpi'];
|
||||
// The primary mount cannot be unmounted from the UI, but its persistence
|
||||
// (an /etc/fstab entry) can be toggled. Any mount outside /media belongs to
|
||||
// the system (/, /boot/efi, /boot/firmware, …) and is entirely untouchable.
|
||||
const PRIMARY_MOUNT = '/media/wrolpi';
|
||||
|
||||
// Helper to format disk size
|
||||
const formatSize = (size) => {
|
||||
|
|
@ -1003,7 +1005,9 @@ function DiskSection() {
|
|||
<Table.Body>
|
||||
{disks.map((disk) => {
|
||||
const isMounted = disk.mountpoint && disk.mountpoint !== '';
|
||||
const isProtected = PROTECTED_MOUNTS.includes(disk.mountpoint);
|
||||
const isPrimary = disk.mountpoint === PRIMARY_MOUNT;
|
||||
// Mounts outside /media (/, /boot/efi, …) are system mounts.
|
||||
const isSystemMount = isMounted && !isPrimary && !disk.mountpoint.startsWith('/media/');
|
||||
const persistent = isMounted && isPersistent(disk.mountpoint);
|
||||
|
||||
return (
|
||||
|
|
@ -1020,7 +1024,7 @@ function DiskSection() {
|
|||
)}
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
{isMounted && !isProtected ? (
|
||||
{isMounted && !isSystemMount ? (
|
||||
<Toggle
|
||||
checked={persistent}
|
||||
onChange={(checked) => handleTogglePersist(disk, checked)}
|
||||
|
|
@ -1031,7 +1035,7 @@ function DiskSection() {
|
|||
)}
|
||||
</Table.Cell>
|
||||
<Table.Cell>
|
||||
{isMounted && isProtected ? (
|
||||
{isMounted && (isSystemMount || isPrimary) ? (
|
||||
<span style={{color: '#888'}}>System</span>
|
||||
) : isMounted ? (
|
||||
<Button
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue