diff -uNr anaconda-13.21.117/iw/autopart\_type.py anaconda-13.21.149/iw/autopart\_type.py
--- anaconda-13.21.117/iw/autopart\_type.py 2011-05-11 02:44:53.000000000 +0900
+++ anaconda-13.21.149/iw/autopart\_type.py 2011-11-05 00:53:03.000000000 +0900
@@ -145,6 +145,9 @@
ics.setTitle("Automatic Partitioning")
ics.setNextEnabled(True)
+ def \_isInteractiveKS(self):
+ return self.anaconda.isKickstart and self.anaconda.id.ksdata.interactive.interactive
+
def getNext(self):
if self.storage.checkNoDisks():
raise gui.StayOnScreen
@@ -152,15 +155,18 @@
# reset storage, this is only done when moving forward, not back
# temporarily unset storage.clearPartType so that all devices will be
# found during storage reset
- clearPartType = self.anaconda.id.storage.clearPartType
- self.anaconda.id.storage.clearPartType = None
- self.anaconda.id.storage.reset()
- self.anaconda.id.storage.clearPartType = clearPartType
+ if not self.\_isInteractiveKS() or \\
+ (self.\_isInteractiveKS() and len(self.storage.devicetree.findActions(type="create")) == 0):
+ clearPartType = self.anaconda.id.storage.clearPartType
+ self.anaconda.id.storage.clearPartType = None
+ self.anaconda.id.storage.reset()
+ self.anaconda.id.storage.clearPartType = clearPartType
self.storage.clearPartChoice = self.buttonGroup.getCurrent()
if self.buttonGroup.getCurrent() == "custom":
self.dispatch.skipStep("autopartitionexecute", skip = 1)
+ self.dispatch.skipStep("cleardiskssel", skip = 1)
self.dispatch.skipStep("partition", skip = 0)
self.dispatch.skipStep("bootloader", skip = 0)
@@ -192,8 +198,11 @@
self.storage.retrofitPassphrase = False
self.storage.encryptedAutoPart = False
- self.storage.doAutoPart = True
+ if not self.\_isInteractiveKS() or \\
+ (self.\_isInteractiveKS() and len(self.storage.devicetree.findActions(type="create")) == 0):
+ self.storage.doAutoPart = True
+ self.dispatch.skipStep("cleardiskssel", skip = 0)
if self.reviewButton.get\_active():
self.dispatch.skipStep("partition", skip = 0)
self.dispatch.skipStep("bootloader", skip = 0)
RHEL6.1でグラフィカルモードで kickstart かけたら、常に doAutoPart 状態になんのかね?