[PATCH 3/4] Make sure autopart without any clearpart command will fail.

[Chris Lumens <clumens redhat com>]

The crucial step here is making sure we set clearPartType to NONE in
setDefaultPartitioning when called with doClear=False.  That's what we pass
in from the autopart kickstart command handler, and that's what forces you
to have to use clearpart if you want to remove existing partitions.
---
 installclass.py |    2 ++
 kickstart.py    |    4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/installclass.py b/installclass.py
index 8e43df1..bca365e 100644
--- a/installclass.py
+++ b/installclass.py
@@ -200,6 +200,8 @@ class BaseInstallClass(object):
         if doClear:
             storage.clearPartType = clear
             storage.clearPartDisks = []
+        else:
+            storage.clearPartType = CLEARPART_TYPE_NONE
 
         storage.autoPartitionRequests = autorequests
 
diff --git a/kickstart.py b/kickstart.py
index 996a1fc..012d1bc 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -141,11 +141,11 @@ class AutoPart(commands.autopart.F9_AutoPart):
 
         # sets up default autopartitioning.  use clearpart separately
         # if you want it
-        self.handler.id.instClass.setDefaultPartitioning(self.handler.id.storage, self.handler.anaconda.platform, doClear = 0)
+        self.handler.id.instClass.setDefaultPartitioning(self.handler.id.storage, self.handler.anaconda.platform, doClear=False)
         self.handler.id.storage.doAutoPart = True
 
         if self.encrypted:
-            self.handler.id.storage.autoEncrypt = True
+            self.handler.id.storage.encryptedAutoPart = True
             self.handler.id.storage.encryptionPassphrase = self.passphrase
 
         self.handler.skipSteps.extend(["partition", "zfcpconfig", "parttype"])
-- 
1.6.1.3