fix: clean up stale raw mounts before scanning in attach wizard
After an interrupted attach wizard, the raw mount stays behind, causing the device to appear as "mounted" in scan results. Now the scan button calls cancel first, which unmounts any stale raw mounts that have no bind mount in fstab. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -323,6 +323,54 @@ func CleanupRawMount(rawPath string) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CleanupStaleRawMounts finds and removes raw mounts that have no corresponding
|
||||||
|
// bind mount — i.e., leftovers from an interrupted attach wizard.
|
||||||
|
// A raw mount is considered "in use" if fstab has a bind entry sourcing from it.
|
||||||
|
func CleanupStaleRawMounts() {
|
||||||
|
data, err := os.ReadFile("/proc/mounts")
|
||||||
|
if err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Read fstab to check for bind mount entries
|
||||||
|
fstabData, _ := os.ReadFile(FstabPath)
|
||||||
|
fstabLines := strings.Split(string(fstabData), "\n")
|
||||||
|
|
||||||
|
for _, line := range strings.Split(string(data), "\n") {
|
||||||
|
fields := strings.Fields(line)
|
||||||
|
if len(fields) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
mountPoint := fields[1]
|
||||||
|
if !strings.HasPrefix(mountPoint, RawMountBase+"/") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
// Only consider direct children of RawMountBase (e.g., /mnt/.felhom-raw/hdd_1)
|
||||||
|
rel := strings.TrimPrefix(mountPoint, RawMountBase+"/")
|
||||||
|
if strings.Contains(rel, "/") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if any fstab bind entry sources from this raw mount path
|
||||||
|
inUse := false
|
||||||
|
for _, fl := range fstabLines {
|
||||||
|
fl = strings.TrimSpace(fl)
|
||||||
|
if fl == "" || strings.HasPrefix(fl, "#") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if strings.Contains(fl, "bind") && strings.HasPrefix(fl, mountPoint) {
|
||||||
|
inUse = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !inUse {
|
||||||
|
_ = exec.Command("umount", mountPoint).Run()
|
||||||
|
_ = os.Remove(mountPoint)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// --- helpers ---
|
// --- helpers ---
|
||||||
|
|
||||||
// getBlkidValue runs blkid to get a single value (TYPE, UUID, LABEL) for a device.
|
// getBlkidValue runs blkid to get a single value (TYPE, UUID, LABEL) for a device.
|
||||||
|
|||||||
@@ -28,3 +28,6 @@ func FinalizeAttach(req AttachRequest, progress chan<- FormatProgress) (string,
|
|||||||
func CleanupRawMount(rawPath string) error {
|
func CleanupRawMount(rawPath string) error {
|
||||||
return fmt.Errorf("storage attach is only supported on Linux")
|
return fmt.Errorf("storage attach is only supported on Linux")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// CleanupStaleRawMounts is a no-op on non-Linux platforms.
|
||||||
|
func CleanupStaleRawMounts() {}
|
||||||
|
|||||||
@@ -1071,22 +1071,23 @@ func (s *Server) storageAttachStatusAPIHandler(w http.ResponseWriter, r *http.Re
|
|||||||
|
|
||||||
// storageAttachCancelHandler handles POST /api/storage/attach/cancel.
|
// storageAttachCancelHandler handles POST /api/storage/attach/cancel.
|
||||||
// Cleans up the temporary raw mount when the user cancels the wizard.
|
// Cleans up the temporary raw mount when the user cancels the wizard.
|
||||||
|
// Also cleans up any stale raw mounts from interrupted previous sessions.
|
||||||
func (s *Server) storageAttachCancelHandler(w http.ResponseWriter, r *http.Request) {
|
func (s *Server) storageAttachCancelHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
s.diskJobMu.Lock()
|
s.diskJobMu.Lock()
|
||||||
rawMount := s.activeRawMount
|
rawMount := s.activeRawMount
|
||||||
s.activeRawMount = ""
|
s.activeRawMount = ""
|
||||||
s.diskJobMu.Unlock()
|
s.diskJobMu.Unlock()
|
||||||
|
|
||||||
if rawMount == "" {
|
if rawMount != "" {
|
||||||
jsonResponse(w, map[string]interface{}{"ok": true, "msg": "Nincs aktív raw mount"})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if err := storage.CleanupRawMount(rawMount); err != nil {
|
if err := storage.CleanupRawMount(rawMount); err != nil {
|
||||||
s.logger.Printf("[WARN] Failed to cleanup raw mount %s: %v", rawMount, err)
|
s.logger.Printf("[WARN] Failed to cleanup raw mount %s: %v", rawMount, err)
|
||||||
} else {
|
} else {
|
||||||
s.logger.Printf("[INFO] Cleaned up raw mount: %s", rawMount)
|
s.logger.Printf("[INFO] Cleaned up raw mount: %s", rawMount)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
jsonResponse(w, map[string]interface{}{"ok": true, "msg": "Raw mount eltávolítva"})
|
// Also clean up any stale raw mounts from previous interrupted sessions
|
||||||
|
storage.CleanupStaleRawMounts()
|
||||||
|
|
||||||
|
jsonResponse(w, map[string]interface{}{"ok": true})
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -167,7 +167,11 @@ function scanDisks() {
|
|||||||
errEl.style.display = 'none';
|
errEl.style.display = 'none';
|
||||||
resultEl.style.display = 'none';
|
resultEl.style.display = 'none';
|
||||||
|
|
||||||
fetch('/api/storage/scan', {method:'POST'})
|
// Clean up any stale raw mounts from interrupted previous sessions first,
|
||||||
|
// so the device appears as available in the scan results.
|
||||||
|
fetch('/api/storage/attach/cancel', {method:'POST'})
|
||||||
|
.catch(function(){}) // ignore cancel errors
|
||||||
|
.then(function() { return fetch('/api/storage/scan', {method:'POST'}); })
|
||||||
.then(function(r){ return r.json(); })
|
.then(function(r){ return r.json(); })
|
||||||
.then(function(data) {
|
.then(function(data) {
|
||||||
btn.textContent = '🔍 Meghajtók keresése';
|
btn.textContent = '🔍 Meghajtók keresése';
|
||||||
|
|||||||
Reference in New Issue
Block a user