gui: tui: storage: Disable the partial adv encrypt support

The support for using encrypted file systems with advanced disk configuration needs a lot more work. Tracking new GitHub Issue in #512 Signed-off-by: Mark D Horn <[email protected]>
clearlinux · Sep 13, 2019 · 2615d01 · 2615d01
1 parent c190a71
commit 2615d01
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/gui/pages/disk_config.go b/gui/pages/disk_config.go
@@ -86,6 +86,7 @@ func (disk *DiskConfig) advancedButtonToggled() {
 	}
 
 	disk.encryptCheck.SetSensitive(storage.AdvancedPartitionsRequireEncryption(disk.model.TargetMedias))
+	disk.encryptCheck.SetActive(false) // Force off for Advance as not support yet
 
 	results := storage.DesktopValidateAdvancedPartitions(disk.model.TargetMedias)
 	if len(results) > 0 {

diff --git a/storage/ops.go b/storage/ops.go
@@ -1498,13 +1498,15 @@ func FindAdvancedInstallTargets(medias []*BlockDevice) []*BlockDevice {
 						}
 					}
 					break
-				case "e":
-					if ch.MountPoint == "/boot" {
-						log.Warning("AdvancedPartitioning: /boot can no be encrypted, skipping")
-					} else {
-						ch.Type = BlockDeviceTypeCrypt
-						log.Debug("AdvancedPartitioning: Encrypt partition %s", ch.Name)
-					}
+					/*
+						case "e":
+							if ch.MountPoint == "/boot" {
+								log.Warning("AdvancedPartitioning: /boot can no be encrypted, skipping")
+							} else {
+								ch.Type = BlockDeviceTypeCrypt
+								log.Debug("AdvancedPartitioning: Encrypt partition %s", ch.Name)
+							}
+					*/
 				case "f":
 					ch.FormatPartition = true
 					log.Debug("AdvancedPartitioning: Format partition %s enabled", ch.Name)
@@ -1679,12 +1681,14 @@ func validateAdvancedPartitions(rootSize uint64, medias []*BlockDevice) []string
 						results = append(results, warning)
 					}
 					break
-				case "e":
-					if strings.HasPrefix(strings.ToLower(ch.PartitionLabel), "clr_boot") {
-						warning := utils.Locale.Get("Encryption of %s is not supported", "CLR_BOOT")
-						results = append(results, warning)
-						log.Warning("validateAdvancedPartitions: %s %+v", warning, ch)
-					}
+					/*
+						case "e":
+							if strings.HasPrefix(strings.ToLower(ch.PartitionLabel), "clr_boot") {
+								warning := utils.Locale.Get("Encryption of %s is not supported", "CLR_BOOT")
+								results = append(results, warning)
+								log.Warning("validateAdvancedPartitions: %s %+v", warning, ch)
+							}
+					*/
 				}
 			}
 		}
@@ -1734,8 +1738,10 @@ func AdvancedPartitionsRequireEncryption(medias []*BlockDevice) bool {
 				switch lowerPart {
 				case "boot":
 					break
-				case "e":
-					encryptionFound = true
+					/*
+						case "e":
+							encryptionFound = true
+					*/
 				}
 			}
 		}

diff --git a/tui/media_config.go b/tui/media_config.go
@@ -360,6 +360,7 @@ func (page *MediaConfigPage) advancedRadioOnChange(active bool) {
 	page.isDestructiveSelected = false
 
 	page.encryptCheck.SetEnabled(storage.AdvancedPartitionsRequireEncryption(page.getModel().TargetMedias))
+	page.encryptCheck.SetState(0) // Force off for Advance as not support yet
 
 	page.advancedCfgBtn.SetEnabled(true)