fix: ignore EINVAL on unmount operations

Fixes #3837 Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
siderolabs · Jun 24, 2021 · f9e01d0 · f9e01d0
1 parent 7672435
commit f9e01d0
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go b/internal/app/machined/pkg/runtime/v1alpha1/v1alpha1_sequencer_tasks.go
@@ -1041,7 +1041,11 @@ func UnmountPodMounts(seq runtime.Sequence, data interface{}) (runtime.TaskExecu
 				logger.Printf("unmounting %s\n", mountpoint)
 
 				if err = unix.Unmount(mountpoint, 0); err != nil {
-					return fmt.Errorf("error unmounting %s: %w", mountpoint, err)
+					if errors.Is(err, syscall.EINVAL) {
+						log.Printf("ignoring unmount error %s: %v", mountpoint, err)
+					} else {
+						return fmt.Errorf("error unmounting %s: %w", mountpoint, err)
+					}
 				}
 			}
 		}
@@ -1077,7 +1081,11 @@ func UnmountSystemDiskBindMounts(seq runtime.Sequence, data interface{}) (runtim
 				logger.Printf("unmounting %s\n", mountpoint)
 
 				if err = unix.Unmount(mountpoint, 0); err != nil {
-					return fmt.Errorf("error unmounting %s: %w", mountpoint, err)
+					if errors.Is(err, syscall.EINVAL) {
+						log.Printf("ignoring unmount error %s: %v", mountpoint, err)
+					} else {
+						return fmt.Errorf("error unmounting %s: %w", mountpoint, err)
+					}
 				}
 			}
 		}