diff options
author | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2012-08-03 10:35:34 -0400 |
commit | 3671cc86e836990077820556387cbb416e709bbd (patch) | |
tree | c8754fc1809bd175304f51bb11776022e9b7ec9d /pyanaconda/kickstart.py | |
parent | ed8bf92fc65050f54463df959a9209ae43af0c54 (diff) | |
parent | db84929284ce85a7af580738551fcc6e172cc690 (diff) | |
download | anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.gz anaconda-3671cc86e836990077820556387cbb416e709bbd.tar.xz anaconda-3671cc86e836990077820556387cbb416e709bbd.zip |
Merge branch 'master' into newui-merge
Conflicts:
Makefile.am
anaconda
data/systemd/anaconda.target
pyanaconda/bootloader.py
pyanaconda/constants.py
pyanaconda/iutil.py
pyanaconda/kickstart.py
pyanaconda/network.py
pyanaconda/vnc.py
scripts/makeupdates
Diffstat (limited to 'pyanaconda/kickstart.py')
-rw-r--r-- | pyanaconda/kickstart.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py index 7e2022ae9..d484b055b 100644 --- a/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py @@ -24,7 +24,7 @@ from storage.devices import LUKSDevice from storage.devicelibs.lvm import getPossiblePhysicalExtents from storage.devicelibs.mpath import MultipathConfigWriter, MultipathTopology from storage.formats import getFormat -from storage.partitioning import doPartitioning +from storage.partitioning import doPartitioning, clearPartitions, shouldClear, swap import storage.iscsi import storage.fcoe import storage.zfcp @@ -546,9 +546,9 @@ class LogVolData(commands.logvol.F17_LogVolData): if self.mountpoint == "swap": type = "swap" self.mountpoint = "" - if self.recommended: - (self.size, self.maxSizeMB) = iutil.swapSuggestion() - self.grow = True + if self.recommended or self.hibernation: + self.size = swap.swapSuggestion(hibernation=self.hibernation) + self.grow = False else: if self.fstype != "": type = self.fstype @@ -856,15 +856,15 @@ class PartitionData(commands.partition.F17_PartData): self.disk = disk break - if self.disk == "": + if not self.disk: raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified BIOS disk %s cannot be determined" % self.onbiosdisk) if self.mountpoint == "swap": type = "swap" self.mountpoint = "" - if self.recommended: - (self.size, self.maxSizeMB) = iutil.swapSuggestion() - self.grow = True + if self.recommended or self.hibernation: + self.size = swap.swapSuggestion(hibernation=self.hibernation) + self.grow = False # if people want to specify no mountpoint for some reason, let them # this is really needed for pSeries boot partitions :( elif self.mountpoint == "None": |