Update kairos sdk to latest master (#89)

Signed-off-by: Itxaka <itxaka.garcia@spectrocloud.com>

go.mod

@@ -10,10 +10,10 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/jaypipes/ghw v0.10.0
 	github.com/joho/godotenv v1.5.1
-	github.com/kairos-io/kairos v1.5.0
+	github.com/kairos-io/kairos v1.24.3-56.0.20230309161837-a50b11904989
 	github.com/moby/sys/mountinfo v0.6.2
 	github.com/mudler/go-kdetect v0.0.0-20210802130128-dd92e121bed8
-	github.com/mudler/yip v0.11.5-0.20230124143654-91e88dfb6648
+	github.com/mudler/yip v1.0.0
 	github.com/onsi/ginkgo/v2 v2.9.0
 	github.com/onsi/gomega v1.27.2
 	github.com/rancher/elemental-cli v0.2.1
@@ -64,7 +64,7 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
+	github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 // indirect
 	github.com/google/renameio v1.0.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
 	github.com/google/uuid v1.3.0 // indirect
@@ -128,7 +128,7 @@ require (
 	github.com/zcalusic/sysinfo v0.9.5 // indirect
 	github.com/zloylos/grsync v1.6.1 // indirect
 	go.opencensus.io v0.23.0 // indirect
-	golang.org/x/crypto v0.5.0 // indirect
+	golang.org/x/crypto v0.6.0 // indirect
 	golang.org/x/exp v0.0.0-20220909182711-5c715a9e8561 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/net v0.7.0 // indirect

go.sum

@@ -852,6 +852,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe
 github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10 h1:CqYfpuYIjnlNxM3msdyPRKabhXZWbKjf3Q8BWROFBso=
+github.com/google/pprof v0.0.0-20230228050547-1710fef4ab10/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/renameio v1.0.0 h1:xhp2CnJmgQmpJU4RY8chagahUq5mbPPAbiSQstKpVMA=
 github.com/google/renameio v1.0.0/go.mod h1:t/HQoYBZSsWSNK35C6CO/TpPLDVWvxOHboWUAweKUpk=
@@ -1063,6 +1065,10 @@ github.com/kairos-io/elemental-cli v0.1.0 h1:rx3J3YPaUIuPyMTb+5Nar+1GdUYAGFYEUkk
 github.com/kairos-io/elemental-cli v0.1.0/go.mod h1:QX1YLPTTSPOkoiYFtVQigDYeM7WqcLimFHgZS/sQbak=
 github.com/kairos-io/kairos v1.5.0 h1:aL+AvZ2EIyDxf2BaYQFeBejB06DfuAxxUqhtVAUtxb8=
 github.com/kairos-io/kairos v1.5.0/go.mod h1:Th2QAMG1Sze2d8S2vb/XjB/o3ap1yjQC+G/WzIX6v04=
+github.com/kairos-io/kairos v1.24.3-56.0.20230309150438-46f21494e301 h1:w3MxwZ66E3y29JQYUhBPm1yHke+XCjKKB1hsQa4c84w=
+github.com/kairos-io/kairos v1.24.3-56.0.20230309150438-46f21494e301/go.mod h1:fMHzLIulqB5J2TZOGYaMyO18eb3XIqhx9y/7PLjFAVw=
+github.com/kairos-io/kairos v1.24.3-56.0.20230309161837-a50b11904989 h1:U+cL7EEPtaJxnJT/ix73eVGJgujXWYtYbe4aWf2y4iw=
+github.com/kairos-io/kairos v1.24.3-56.0.20230309161837-a50b11904989/go.mod h1:MuKWsOjRevyfEe8Snbe1NZAKT1RzOLWvo2vKLTV4jjI=
 github.com/kendru/darwin/go/depgraph v0.0.0-20220319173517-8abc3541da93/go.mod h1:VOfm8h1NySetVlpHDSnbpCMsvCgYaU+YDn4XezUy2+4=
 github.com/kendru/darwin/go/depgraph v0.0.0-20221105232959-877d6a81060c h1:eKb4PqwAMhlqwXw0W3atpKaYaPGlXE/Fwh+xpCEYaPk=
 github.com/kendru/darwin/go/depgraph v0.0.0-20221105232959-877d6a81060c/go.mod h1:VOfm8h1NySetVlpHDSnbpCMsvCgYaU+YDn4XezUy2+4=
@@ -1267,6 +1273,8 @@ github.com/mudler/topsort v0.0.0-20201103161459-db5c7901c290 h1:426hFyXMpXeqIeGJ
 github.com/mudler/topsort v0.0.0-20201103161459-db5c7901c290/go.mod h1:uP5BBgFxq2wNWo7n1vnY5SSbgL0WDshVJrOO12tZ/lA=
 github.com/mudler/yip v0.11.5-0.20230124143654-91e88dfb6648 h1:+UZPjgWOTB1LyWI5qHTReIGXDSlXynGl2kIihi/lU98=
 github.com/mudler/yip v0.11.5-0.20230124143654-91e88dfb6648/go.mod h1:7d0bnZ326k/bmeTvLZL5ZQx4QNi0a7mfrnGzb+2ZkrA=
+github.com/mudler/yip v1.0.0 h1:GyW+XdkpS0PaAJh4rARiP8Bn/PmT+OOk190UJasO/z4=
+github.com/mudler/yip v1.0.0/go.mod h1:YJBE9DrPfBnNG+BmTy3zpI8dzZ2JJCEbZkrmvuHuNGQ=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -1878,6 +1886,8 @@ golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw
 golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/crypto v0.5.0 h1:U/0M97KRkSFvyD/3FSmdP5W5swImpNgle/EHFhOsQPE=
 golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
+golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
+golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190125153040-c74c464bbbf2/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

internal/utils/common.go

@@ -162,17 +162,8 @@ func GetState() string {
 	switch runtime.BootState {
 	case state.Active, state.Passive:
 		label = filepath.Join("/dev/disk/by-label/", runtime.State.Label)
-		// Workaround for ghw 0.10.0 while runtime uses the old one so it returns like everything is empty
-		// https://github.com/kairos-io/kairos/pull/1073
-		// This requires a bumped kairos sdk
-		if runtime.State.Label == "" {
-			label = "/dev/disk/by-label/COS_STATE"
-		}
 	case state.Recovery:
 		label = filepath.Join("/dev/disk/by-label/", runtime.Recovery.Label)
-		if runtime.Recovery.Label == "" {
-			label = "/dev/disk/by-label/COS_RECOVERY"
-		}
 	}
 	Log.Debug().Str("what", label).Msg("Get state label")
 	return label

internal/utils/utils_test.go

@@ -330,6 +330,7 @@ var _ = Describe("mount utils", func() {
 					{
 						Name:            "device2",
 						FilesystemLabel: "COS_OEM",
+						Label:           "COS_OEM",
 						Type:            "ext4",
 						MountPoint:      "/oem",
 					},

pkg/mount/dag_steps.go

@@ -357,14 +357,6 @@ func (s *State) WriteSentinelDagStep(g *herd.Graph) error {
 				sentinel = string(state.Unknown)
 			}
 
-			// Workaround for runtime not detecting netboot/rd.cos.disable/rd.immucore.disable as live_mode
-			// TODO: drop once the netboot/rd.cos.disable detection change is on the kairos sdk
-			cmdline, _ := os.ReadFile(internalUtils.GetHostProcCmdline())
-			cmdlineS := string(cmdline)
-			if strings.Contains(cmdlineS, "netboot") || len(internalUtils.ReadCMDLineArg("rd.cos.disable")) > 0 || len(internalUtils.ReadCMDLineArg("rd.immucore.disable")) > 0 {
-				sentinel = "live_mode"
-			}
-
 			internalUtils.Log.Info().Str("to", sentinel).Msg("Setting sentinel file")
 			err = os.WriteFile(filepath.Join("/run/cos/", sentinel), []byte("1"), os.ModePerm)
 			if err != nil {
@@ -372,7 +364,8 @@ func (s *State) WriteSentinelDagStep(g *herd.Graph) error {
 			}
 
 			// Lets add a uki sentinel as well!
-			if strings.Contains(cmdlineS, "rd.immucore.uki") {
+			cmdline, _ := os.ReadFile(internalUtils.GetHostProcCmdline())
+			if strings.Contains(string(cmdline), "rd.immucore.uki") {
 				err = os.WriteFile("/run/cos/uki_mode", []byte("1"), os.ModePerm)
 				if err != nil {
 					return err