Use more concise not-in-recovery syntax

Signed-off-by: Andrea Mazzotti <andrea.mazzotti@suse.com>
rancher · Aug 5, 2024 · 48a4555 · 48a4555
1 parent a212d9e
commit 48a4555
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/network/network.go b/pkg/network/network.go
@@ -124,7 +124,7 @@ func (n *nmstateConfigurator) GetNetworkConfigApplicator(networkConfig elemental
 	configApplicator.Stages = map[string][]schema.Stage{
 		"initramfs": {
 			schema.Stage{
-				If:    "[ -f /run/elemental/active_mode ] || [ -f /run/elemental/passive_mode ]",
+				If:    "[ ! -f /run/elemental/recovery_mode ]",
 				Files: yipFiles,
 			},
 		},

diff --git a/pkg/network/network_test.go b/pkg/network/network_test.go
@@ -91,7 +91,7 @@ var _ = Describe("network configurator", Label("network", "configurator"), func(
 		stage, found := applicator.Stages["initramfs"]
 		Expect(found).To(BeTrue(), "Config should be applied at initramfs stage")
 
-		Expect(stage[0].If).To(Equal("[ -f /run/elemental/active_mode ] || [ -f /run/elemental/passive_mode ]"), "Network config must be applied on active or passive systems only (not recovery)")
+		Expect(stage[0].If).To(Equal("[ ! -f /run/elemental/recovery_mode ]"), "Network config must be applied on active or passive systems only (not recovery)")
 		Expect(len(stage[0].Files)).To(Equal(2), "Two nmconnection files must have been copied")
 		Expect(stage[0].Files[0].Content).To(Equal("[connection]\nid=Wired connection 1\n"))
 		Expect(stage[0].Files[0].Path).To(Equal(filepath.Join(systemConnectionsDir, "wired1.nmconnection")))