From 305f130358efd804cabc3ee1482222e88a194cfd Mon Sep 17 00:00:00 2001 From: David Cassany Date: Wed, 14 Feb 2024 17:54:44 +0100 Subject: [PATCH] Make grubfallback test more generic Signed-off-by: David Cassany --- tests/grubfallback/grubfallback_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/grubfallback/grubfallback_test.go b/tests/grubfallback/grubfallback_test.go index 2ef892a42d1..954b2ed5c5f 100644 --- a/tests/grubfallback/grubfallback_test.go +++ b/tests/grubfallback/grubfallback_test.go @@ -17,6 +17,8 @@ limitations under the License. package elemental_test import ( + "fmt" + sut "github.com/rancher/elemental-toolkit/tests/vm" . "github.com/onsi/ginkgo/v2" @@ -44,9 +46,15 @@ var _ = Describe("Elemental booting fallback tests", func() { It("fallbacks by booting into recovery", func() { Expect(s.BootFrom()).To(Equal(sut.Active)) - _, err := s.Command("mount -o rw,remount /run/initramfs/elemental-state") + _, err := s.Command("mount -o rw,remount /run/elemental/efi") Expect(err).ToNot(HaveOccurred()) - _, err = s.Command("rm -rf /run/initramfs/elemental-state/.snapshots/1/snapshot.img") + cmd := "grub2-editenv" + _, err = s.Command(fmt.Sprintf("which %s", cmd)) + if err != nil { + cmd = "grub-editenv" + } + + _, err = s.Command(fmt.Sprintf("%s /run/elemental/efi/grub_oem_env set state_label=wrongvalue", cmd)) Expect(err).ToNot(HaveOccurred()) s.Reboot()