fix: make Talos work on Rockpi 4c boards again

Suppress `efivars` `ENODEV` errors: skip mount and proceed with boot sequence. Signed-off-by: Artem Chernyshev <[email protected]>
siderolabs · Oct 25, 2023 · ffa5e05 · ffa5e05
1 parent 8eba4c5
commit ffa5e05
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/internal/pkg/mount/mount.go b/internal/pkg/mount/mount.go
@@ -7,6 +7,7 @@ package mount
 import (
 	"bufio"
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -67,6 +68,14 @@ func mountMountpoint(mountpoint *Point) (skipMount bool, err error) {
 
 	if !skipMount {
 		if err = mountpoint.Mount(); err != nil {
+			if mountpoint.MountFlags.Check(SkipIfNoDevice) && errors.Is(err, unix.ENODEV) {
+				if mountpoint.Logger != nil {
+					mountpoint.Logger.Printf("error mounting: %q: %s", mountpoint.Source(), err)
+				}
+
+				return true, nil
+			}
+
 			return false, fmt.Errorf("error mounting: %w", err)
 		}
 	}

diff --git a/internal/pkg/mount/options.go b/internal/pkg/mount/options.go
@@ -33,6 +33,8 @@ const (
 	SkipIfMounted
 	// SkipIfNoFilesystem is a flag for skipping formatting and mounting if the mountpoint has not filesystem.
 	SkipIfNoFilesystem
+	// SkipIfNoDevice is a flag for skipping errors when the device is not found.
+	SkipIfNoDevice
 )
 
 // Flags is the mount flags.

diff --git a/internal/pkg/mount/pseudo.go b/internal/pkg/mount/pseudo.go
@@ -35,7 +35,9 @@ func PseudoSubMountPoints() (mountpoints *Points, err error) {
 
 	if _, err := os.Stat(constants.EFIVarsMountPoint); err == nil {
 		// mount EFI vars if they exist
-		pseudo.Set("efivars", NewMountPoint("efivarfs", constants.EFIVarsMountPoint, "efivarfs", unix.MS_NOSUID|unix.MS_NOEXEC|unix.MS_NODEV|unix.MS_RELATIME|unix.MS_RDONLY, ""))
+		pseudo.Set("efivars", NewMountPoint("efivarfs", constants.EFIVarsMountPoint, "efivarfs", unix.MS_NOSUID|unix.MS_NOEXEC|unix.MS_NODEV|unix.MS_RELATIME|unix.MS_RDONLY, "",
+			WithFlags(SkipIfNoDevice),
+		))
 	}
 
 	return pseudo, nil