parse-kickstart: improve logging

Emit logging messages when 'rd.debug' or 'rd.info' are passed.

1 files changed, 9 insertions, 3 deletions

diff --git a/dracut/parse-kickstart b/dracut/parse-kickstart
index 3b6b86129..2d3556035 100755
--- a/dracut/parse-kickstart
+++ b/dracut/parse-kickstart
@@ -108,7 +108,6 @@ class DracutHandler(handlerclass):
         command = self.commands[cmd]
         if hasattr(command, "dracut_args"):
             log.debug("kickstart line %u: handling %s", lineno, cmd)
-            line = " ".join(args)
             self.output.append(command.dracut_args(args, lineno, obj))
         return obj
 
@@ -120,12 +119,16 @@ class KmsgFormatter(logging.Formatter):
         elif record.levelno <= logging.WARNING: tag = "<28>"
         else: tag = "<24>"
         return tag + logging.Formatter.format(self, record)
-def init_logger():
+def init_logger(level=logging.WARNING):
+    if 'rd.debug' in proc_cmdline:
+        level = logging.DEBUG
+    elif 'rd.info' in proc_cmdline:
+        level = logging.INFO
     logfmt = "%(name)s %(levelname)s: %(message)s"
     stderr = logging.StreamHandler()
     stderr.setFormatter(logging.Formatter(logfmt))
     logger = logging.getLogger('parse-kickstart')
-    logger.setLevel(logging.WARNING)
+    logger.setLevel(level)
     logger.addHandler(stderr)
     try:
         kmsg = logging.FileHandler("/dev/kmsg", "w")
@@ -270,6 +273,7 @@ def ksnet_to_ifcfg(net, filename=None):
     # TODO: handle essid/wepkey/wpakey (maybe inside anaconda)
 
     try:
+        log.info("writing ifcfg for %s", dev)
         outf = open(filename, "w")
         outf.write('# Generated by parse-kickstart\n')
         for k,v in ifcfg.items():
@@ -284,6 +288,7 @@ def process_kickstart(ksfile):
     handler = DracutHandler()
     handler.ksdevice = os.environ.get('ksdevice')
     parser = KickstartParser(handler)
+    log.info("processing kickstart file %s", ksfile)
     processed_file = preprocessKickstart(ksfile)
     try:
         parser.readKickstart(processed_file)
@@ -291,6 +296,7 @@ def process_kickstart(ksfile):
         log.error(str(e))
     with open("/tmp/ks.info", "a") as f:
         f.write('parsed_kickstart="%s"\n' % processed_file)
+    log.info("finished parsing kickstart")
     return processed_file, handler.output
 
 if __name__ == '__main__':