Update translate.go

coreos · Oct 9, 2023 · 2c77237 · 2c77237
1 parent 4ac37f1
commit 2c77237
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/config/fcos/v1_6_exp/translate.go b/config/fcos/v1_6_exp/translate.go
@@ -124,7 +124,6 @@ func (c Config) processBootDevice(config *types.Config, ts *translate.Translatio
 	var wantBIOSPart bool
 	var wantEFIPart bool
 	var wantPRePPart bool
-	var wantS390x bool
 	layout := c.BootDevice.Layout
 	switch {
 	case layout == nil || *layout == "x86_64":
@@ -134,10 +133,6 @@ func (c Config) processBootDevice(config *types.Config, ts *translate.Translatio
 		wantEFIPart = true
 	case *layout == "ppc64le":
 		wantPRePPart = true
-	case *layout == "s390x-eckd":
-		wantS390x = true
-	case *layout == "s390x-zfcp":
-		wantS390x = true
 	case *layout == "s390x-virt":
 		wantBIOSPart = true
 		wantEFIPart = true
@@ -248,12 +243,12 @@ func (c Config) processBootDevice(config *types.Config, ts *translate.Translatio
 	// encrypted root partition
 	if wantLuks {
 		var luksDevice string
-		var device_s390x string
 		switch {
-		case wantS390x:
-			//Luks Device for dasd and zFCP-scsi
-			device_s390x = *c.BootDevice.Luks.Device
-			luksDevice = device_s390x + "2"
+		//Luks Device for dasd and zFCP-scsi
+		case layout != nil && *layout == "s390x-eckd":
+			luksDevice = *c.BootDevice.Luks.Device + "2"
+		case layout != nil && *layout == "s390x-zfcp":
+			luksDevice = *c.BootDevice.Luks.Device + "4"
 		case wantMirror:
 			luksDevice = "/dev/md/md-root"
 		default: