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/installclass.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/installclass.py')
| -rw-r--r-- | pyanaconda/installclass.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py index 17a0c11b4..de4259f46 100644 --- a/pyanaconda/installclass.py +++ b/pyanaconda/installclass.py @@ -32,6 +32,7 @@ import types from constants import * from product import * from storage.partspec import * +from storage.devicelibs import swap import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -116,9 +117,9 @@ class BaseInstallClass(object): if bootreq: autorequests.extend(bootreq) - (minswap, maxswap) = iutil.swapSuggestion() - autorequests.append(PartSpec(fstype="swap", size=minswap, maxSize=maxswap, - grow=True, lv=True, encrypted=True)) + swap = swap.swapSuggestion() + autorequests.append(PartSpec(fstype="swap", size=swap, grow=False, + lv=True, encrypted=True)) storage.autoPartitionRequests = autorequests |