[PATCH 1/2] Only set clearpart data if the command was provided in the kickstart file.

[Chris Lumens <clumens@xxxxxxxxxx>]

This prevents clearPartType from getting set to None, which causes problems
in shouldClear.
---
 kickstart.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index eb79bd9..445107e 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1182,10 +1182,11 @@ def fullCommandPass(anaconda, file, earlyKS):
     anaconda.id.storage.ignoredDisks = earlyKS.ignoredisk.ignoredisk
     anaconda.id.storage.exclusiveDisks = earlyKS.ignoredisk.onlyuse
 
-    anaconda.id.storage.clearPartType = earlyKS.clearpart.type
-    anaconda.id.storage.clearPartDisks = earlyKS.clearpart.drives
-    if earlyKS.clearpart.initAll:
-        anaconda.id.storage.reinitializeDisks = earlyKS.clearpart.initAll
+    if earlyKS.clearpart.type is not None:
+        anaconda.id.storage.clearPartType = earlyKS.clearpart.type
+        anaconda.id.storage.clearPartDisks = earlyKS.clearpart.drives
+        if earlyKS.clearpart.initAll:
+            anaconda.id.storage.reinitializeDisks = earlyKS.clearpart.initAll
 
     storage.storageInitialize(anaconda)
 
-- 
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list