[backport] Disable boot entry if efivars is read-only (#2059)

pkg/action/install.go

@@ -61,7 +61,10 @@ func NewInstallAction(cfg *types.RunConfig, spec *types.InstallSpec, opts ...Ins
 	}
 
 	if i.bootloader == nil {
-		i.bootloader = bootloader.NewGrub(&cfg.Config, bootloader.WithGrubDisableBootEntry(i.spec.DisableBootEntry))
+		i.bootloader = bootloader.NewGrub(&cfg.Config,
+			bootloader.WithGrubDisableBootEntry(i.spec.DisableBootEntry),
+			bootloader.WithGrubAutoDisableBootEntry(),
+		)
 	}
 
 	if i.snapshotter == nil {

pkg/action/reset.go

@@ -84,7 +84,9 @@ func NewResetAction(cfg *types.RunConfig, spec *types.ResetSpec, opts ...ResetAc
 
 	if r.bootloader == nil {
 		r.bootloader = bootloader.NewGrub(
-			&cfg.Config, bootloader.WithGrubDisableBootEntry(r.spec.DisableBootEntry),
+			&cfg.Config,
+			bootloader.WithGrubDisableBootEntry(r.spec.DisableBootEntry),
+			bootloader.WithGrubAutoDisableBootEntry(),
 			bootloader.WithGrubClearBootEntry(false),
 		)
 	}

pkg/bootloader/grub.go

@@ -23,6 +23,7 @@ import (
 	"regexp"
 
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
+	"github.com/rancher/elemental-toolkit/v2/pkg/elemental"
 	"github.com/rancher/elemental-toolkit/v2/pkg/types"
 	"github.com/rancher/elemental-toolkit/v2/pkg/utils"
 
@@ -121,6 +122,28 @@ func WithGrubDisableBootEntry(disableBootEntry bool) func(g *Grub) error {
 	}
 }
 
+func WithGrubAutoDisableBootEntry() func(g *Grub) error {
+	return func(g *Grub) error {
+		if g.disableBootEntry {
+			// already disabled manually, doing nothing
+			return nil
+		}
+
+		rw, err := elemental.IsRWMountPoint(g.runner, constants.EfivarsMountPath)
+		if err != nil {
+			g.logger.Errorf("error finding efivar mounts: %s", err.Error())
+			return err
+		}
+
+		// If efivars is not RW, disable writing boot entries.
+		if !rw {
+			g.disableBootEntry = true
+		}
+
+		return nil
+	}
+}
+
 func WithGrubClearBootEntry(clearBootEntry bool) func(g *Grub) error {
 	return func(g *Grub) error {
 		g.clearBootEntry = clearBootEntry

pkg/bootloader/grub_test.go

@@ -105,8 +105,15 @@ var _ = Describe("Booloader", Label("bootloader", "grub"), func() {
 		)
 	})
 
-	It("installs without errors", func() {
-		grub = bootloader.NewGrub(cfg, bootloader.WithGrubDisableBootEntry(true))
+	It("installs without errors and auto detects there is no writable efivars", func() {
+		runner.SideEffect = func(cmd string, args ...string) ([]byte, error) {
+			if cmd == "findmnt" && len(args) > 0 && args[0] == "-fno" {
+				return []byte("ro"), nil
+			}
+			return []byte{}, nil
+		}
+
+		grub = bootloader.NewGrub(cfg, bootloader.WithGrubAutoDisableBootEntry())
 		Expect(grub.Install(rootDir, efiDir)).To(Succeed())
 
 		// Check grub config in EFI directory

pkg/constants/constants.go

@@ -63,6 +63,7 @@ const (
 	Tmpfs              = "tmpfs"
 	Autofs             = "auto"
 	Block              = "block"
+	EfivarsMountPath   = "/sys/firmware/efi/efivars"
 
 	// Maxium number of nested symlinks to resolve
 	MaxLinkDepth = 4

pkg/elemental/elemental.go

@@ -177,8 +177,8 @@ func IsMounted(c types.Config, part *types.Partition) (bool, error) {
 	return !notMnt, nil
 }
 
-func IsRWMountPoint(c types.Config, mountPoint string) (bool, error) {
-	cmdOut, err := c.Runner.Run("findmnt", "-fno", "OPTIONS", mountPoint)
+func IsRWMountPoint(r types.Runner, mountPoint string) (bool, error) {
+	cmdOut, err := r.Run("findmnt", "-fno", "OPTIONS", mountPoint)
 	if err != nil {
 		return false, err
 	}
@@ -193,7 +193,7 @@ func IsRWMountPoint(c types.Config, mountPoint string) (bool, error) {
 // MountRWPartition mounts, or remounts if needed, a partition with RW permissions
 func MountRWPartition(c types.Config, part *types.Partition) (umount func() error, err error) {
 	if mnt, _ := IsMounted(c, part); mnt {
-		if ok, _ := IsRWMountPoint(c, part.MountPoint); ok {
+		if ok, _ := IsRWMountPoint(c.Runner, part.MountPoint); ok {
 			c.Logger.Debugf("Already RW mounted: %s at %s", part.Name, part.MountPoint)
 			return func() error { return nil }, nil
 		}

pkg/snapshotter/loopdevice.go

@@ -26,6 +26,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/go-multierror"
+
 	"github.com/rancher/elemental-toolkit/v2/pkg/constants"
 	"github.com/rancher/elemental-toolkit/v2/pkg/elemental"
 
@@ -91,7 +92,7 @@ func (l *LoopDevice) InitSnapshotter(state *types.Partition, efiDir string) erro
 		l.legacyClean = true
 
 		// Legacy deployments might not include RW mounts for state partitions
-		if ok, _ := elemental.IsRWMountPoint(l.cfg, l.rootDir); !ok {
+		if ok, _ := elemental.IsRWMountPoint(l.cfg.Runner, l.rootDir); !ok {
 			err = l.cfg.Mounter.Mount("", l.rootDir, "auto", []string{"remount", "rw"})
 			if err != nil {
 				l.cfg.Logger.Errorf("Failed remounting root as RW: %v", err)