diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-05-11 11:57:18 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-05-11 14:46:42 -0400 |
| commit | 5c5fe893b6cfe9edbabf7945b51730078b6ac1b0 (patch) | |
| tree | 3f40fe7bc70c64781cf44586875f505911537290 | |
| parent | d94c117c223a1937ba1dfefaf3e6b342696daf4b (diff) | |
| download | anaconda-5c5fe893b6cfe9edbabf7945b51730078b6ac1b0.tar.gz anaconda-5c5fe893b6cfe9edbabf7945b51730078b6ac1b0.tar.xz anaconda-5c5fe893b6cfe9edbabf7945b51730078b6ac1b0.zip | |
Only set clearpart data if the command was provided in the kickstart file.
This prevents clearPartType from getting set to None, which causes problems
in shouldClear.
| -rw-r--r-- | kickstart.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/kickstart.py b/kickstart.py index eb79bd9df..445107e69 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) |