summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lumens <clumens@redhat.com>2012-07-10 12:38:27 -0400
committerChris Lumens <clumens@redhat.com>2012-07-12 13:28:05 -0400
commit7c6d75b7691a863943240c79ede13c04a7101b2f (patch)
tree8be9e58892ffa0cbb466b989cff9b50da8f16ad7
parentfed27f3b71fc22164e905f1b5b98a40e3cd38636 (diff)
downloadanaconda-7c6d75b7691a863943240c79ede13c04a7101b2f.tar.gz
anaconda-7c6d75b7691a863943240c79ede13c04a7101b2f.tar.xz
anaconda-7c6d75b7691a863943240c79ede13c04a7101b2f.zip
Run the logging kickstart command right after parsing.
-rwxr-xr-xanaconda4
-rw-r--r--pyanaconda/kickstart.py2
2 files changed, 5 insertions, 1 deletions
diff --git a/anaconda b/anaconda
index dd871eed8..d92269bd1 100755
--- a/anaconda
+++ b/anaconda
@@ -849,6 +849,10 @@ if __name__ == "__main__":
ksdata = kickstart.parseKickstart(anaconda, opts.ksfile)
if ksdata.rescue.rescue:
anaconda.rescue = True
+
+ # Some kickstart commands must be executed immediately, as they affect
+ # how anaconda operates.
+ ksdata.logging.execute()
else:
ksdata = kickstart.AnacondaKSHandler(anaconda)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 88e6ff4d0..4ecf9f532 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -643,7 +643,7 @@ class LogVolData(commands.logvol.F17_LogVolData):
self.anaconda.dispatch.skip_steps("partition", "parttype")
class Logging(commands.logging.FC6_Logging):
- def execute(self):
+ def execute(self, *args):
if logger.tty_loglevel == DEFAULT_TTY_LEVEL:
# not set from the command line
level = logLevelMap[self.level]