Remove Viper from PutEveCerts

Related to lf-edge#855 Signed-off-by: Pavel Abramov <[email protected]>
uncleDecart · Oct 11, 2024 · c22e8a7 · c22e8a7
1 parent 709af93
commit c22e8a7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/eden/eden.go b/pkg/eden/eden.go
@@ -523,7 +523,7 @@ func GenerateEveCerts(certsDir, domain, ip, eveIP, uuid, devModel, ssid, arch, p
 }
 
 // PutEveCerts function put certs for zedcontrol
-func PutEveCerts(certsDir, devModel, ssid, password string) (err error) {
+func PutEveCerts(certsDir, devModel, ssid, arch, password string) (err error) {
 	model, err := models.GetDevModelByName(devModel)
 	if err != nil {
 		return fmt.Errorf("GenerateEveCerts: %s", err)
@@ -591,7 +591,7 @@ func PutEveCerts(certsDir, devModel, ssid, password string) (err error) {
 			}
 		}
 	}
-	if model.DevModelType() == defaults.DefaultQemuModel && viper.GetString("eve.arch") == "arm64" {
+	if model.DevModelType() == defaults.DefaultQemuModel && arch == "arm64" {
 		// we need to properly set console for qemu arm64
 		if err := os.WriteFile(filepath.Join(certsDir, "grub.cfg"), []byte("set_global dom0_console \"console=ttyAMA0,115200 $dom0_console\""), 0666); err != nil {
 			return fmt.Errorf("GenerateEveCerts: %s", err)

diff --git a/pkg/openevec/eden.go b/pkg/openevec/eden.go
@@ -381,7 +381,7 @@ func setupConfigDir(cfg EdenSetupArgs, eveConfigDir, softSerial, zedControlURL s
 			}
 			log.Info("GenerateEveCerts done")
 		} else {
-			if err := eden.PutEveCerts(cfg.Eden.CertsDir, cfg.Eve.DevModel, cfg.Eve.Ssid, wifiPSK); err != nil {
+			if err := eden.PutEveCerts(cfg.Eden.CertsDir, cfg.Eve.DevModel, cfg.Eve.Ssid, cfg.Eve.Arch, wifiPSK); err != nil {
 				return fmt.Errorf("cannot GenerateEveCerts: %w", err)
 			}
 			log.Info("GenerateEveCerts done")