Resolves: rhbz#744129
---
kickstart.py | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index de2dbe9..37901c9 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -726,6 +726,9 @@ class PartitionData(commands.partition.F12_PartData):
if self.recommended:
(self.size, self.maxSizeMB) = iutil.swapSuggestion()
self.grow = True
+ if self.sameAsRam:
+ (self.size, self.maxSizeMB) = iutil.swapSameAsRam()
+ 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":
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Resolves: rhbz#744129
---
kickstart.py | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/kickstart.py b/kickstart.py
index de2dbe9..1e39b11 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -703,7 +703,7 @@ class DmRaid(commands.dmraid.FC6_DmRaid):
def parse(self, args):
raise NotImplementedError("The dmraid kickstart command is not currently supported")

-class PartitionData(commands.partition.F12_PartData):
+class PartitionData(commands.partition.RHEL6_PartData):
def execute(self, anaconda):
storage = anaconda.id.storage
devicetree = storage.devicetree
@@ -726,6 +726,10 @@ class PartitionData(commands.partition.F12_PartData):
if self.recommended:
(self.size, self.maxSizeMB) = iutil.swapSuggestion()
self.grow = True
+
+ if self.sameAsRam:
+ (self.size, self.maxSizeMB) = iutil.swapSameAsRam()
+ 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":
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

(ported e6f33de263ec493b17ac2000afd894ece35d19a9 from rhel6-branch)
---
pyanaconda/kickstart.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index a13be6b..db44277 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -821,7 +821,7 @@ class DmRaid(commands.dmraid.FC6_DmRaid):
def parse(self, args):
raise NotImplementedError("The dmraid kickstart command is not currently supported")

-class PartitionData(commands.partition.F17_PartData):
+class PartitionData(commands.partition.F18_PartData):
def execute(self):
storage = self.anaconda.storage
devicetree = storage.devicetree
@@ -844,6 +844,11 @@ class PartitionData(commands.partition.F17_PartData):
if self.recommended:
(self.size, self.maxSizeMB) = swap.swapSuggestion()
self.grow = True
+
+ if self.sameAsRam:
+ (self.size, self.maxSizeMB) = swap.swapSameAsRam()
+ 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":
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Please see 101ef4a5d3060069aaa290fe753c4522ebde966a for the details.

(ported e6f33de263ec493b17ac2000afd894ece35d19a9 from rhel6-branch)
---
pyanaconda/kickstart.py | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index a13be6b..db44277 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -821,7 +821,7 @@ class DmRaid(commands.dmraid.FC6_DmRaid):
def parse(self, args):
raise NotImplementedError("The dmraid kickstart command is not currently supported")

-class PartitionData(commands.partition.F17_PartData):
+class PartitionData(commands.partition.F18_PartData):
def execute(self):
storage = self.anaconda.storage
devicetree = storage.devicetree
@@ -844,6 +844,11 @@ class PartitionData(commands.partition.F17_PartData):
if self.recommended:
(self.size, self.maxSizeMB) = swap.swapSuggestion()
self.grow = True
+
+ if self.sameAsRam:
+ (self.size, self.maxSizeMB) = swap.swapSameAsRam()
+ 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":
--
1.7.4.4

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list