diff options
| author | David Lehman <dlehman@redhat.com> | 2008-07-09 18:58:55 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2008-08-13 20:57:10 -0500 |
| commit | 8c8013ffdadb4ee9f9dad81fabccb99228214d78 (patch) | |
| tree | 848cd1747bcb1cb91a66c5f10cc7757abfa56369 /partitions.py | |
| parent | 18cd13922234ec66a4655e5239db568da75eae49 (diff) | |
| download | anaconda-8c8013ffdadb4ee9f9dad81fabccb99228214d78.tar.gz anaconda-8c8013ffdadb4ee9f9dad81fabccb99228214d78.tar.xz anaconda-8c8013ffdadb4ee9f9dad81fabccb99228214d78.zip | |
Consider clearpart and ignoredisk when scanning for encrypted partitions.
Diffstat (limited to 'partitions.py')
| -rw-r--r-- | partitions.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/partitions.py b/partitions.py index ed9d4fac5..761d47333 100644 --- a/partitions.py +++ b/partitions.py @@ -243,6 +243,13 @@ class Partitions: drives = diskset.disks.keys() drives.sort() for drive in drives: + if diskset.anaconda.isKickstart and \ + ((self.autoClearPartType != CLEARPART_TYPE_NONE and \ + (not self.autoClearPartDrives or \ + drive in self.autoClearPartDrives)) or \ + drive in diskset.skippedDisks): + continue + disk = diskset.disks[drive] part = disk.next_partition() while part: |