zerombr is used during storage.DASD.startup() if the user is performing
a non-interactive kickstart install. Since the full kickstart file is
not processed until after the storage object has initialized, we need to
include this flag in the early kickstart processing because it's used
during the storage object initialization.
---
kickstart.py | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/kickstart.py b/kickstart.py
index 8029861..d934063 100644
--- a/kickstart.py
+++ b/kickstart.py
@@ -1015,7 +1015,8 @@ class XConfig(commands.xconfig.F10_XConfig):
class ZeroMbr(commands.zerombr.FC3_ZeroMbr):
def parse(self, args):
retval = commands.zerombr.FC3_ZeroMbr.parse(self, args)
- self.handler.id.storage.zeroMbr = 1
+ if self.handler.id and self.handler.id.storage:
+ self.handler.id.storage.zeroMbr = 1
return retval
class ZFCP(commands.zfcp.FC3_ZFCP):
@@ -1125,7 +1126,8 @@ class EarlyKSHandler(superclass):
self.id = self.anaconda.id
self.maskAllExcept(["vnc", "displaymode", "text", "cmdline",
- "graphical", "rescue", "ignoredisk", "clearpart"])
+ "graphical", "rescue", "ignoredisk", "clearpart",
+ "zerombr"])
class AnacondaPreParser(KickstartParser):
# A subclass of KickstartParser that only looks for %pre scripts and
@@ -1247,6 +1249,7 @@ def fullCommandPass(anaconda, file, earlyKS):
# which disks to avoid, and we only get that information from the earlier
# processing of the kickstart file.
import storage
+ anaconda.id.storage.zeroMbr = earlyKS.zerombr.zerombr
anaconda.id.storage.ignoredDisks = earlyKS.ignoredisk.ignoredisk
anaconda.id.storage.exclusiveDisks = earlyKS.ignoredisk.onlyuse
--
1.6.2.5
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
