add debug to kargs for the no-hangcheck option

[plcapi.git] / PLC / Methods / GetBootMedium.py

diff --git a/PLC/Methods/GetBootMedium.py b/PLC/Methods/GetBootMedium.py
index f7f0c4b..1c4e6a4 100644 (file)
--- a/PLC/Methods/GetBootMedium.py
+++ b/PLC/Methods/GetBootMedium.py
@@ -177,7 +177,7 @@ class GetBootMedium(Method):
             file += 'NODE_ID="%d"\n' % node['node_id']
             file += 'NODE_KEY="%s"\n' % node['key']
             # not used anywhere, just a note for operations people
-            file += 'KEY_RENEWAL_DATE="%s"\n' % time.strftime('%Y-%m-%d at %H:%M:%S +0000',time.gmtime())
+            file += 'KEY_RENEWAL_DATE="%s"\n' % time.strftime('%Y/%m/%d at %H:%M +0000',time.gmtime())
 
         if primary['mac']:
             file += 'NET_DEVICE="%s"\n' % primary['mac'].lower()
@@ -283,7 +283,7 @@ class GetBootMedium(Method):
                 raise PLCInvalidArgument, "Options are not supported for node configs"
         else:
             # create a dict for build.sh 
-            build_sh_spec={'-k':[]}
+            build_sh_spec={'kargs':[]}
             for option in options:
                 if option == "cramfs":
                     build_sh_spec['cramfs']=True
@@ -297,7 +297,8 @@ class GetBootMedium(Method):
                 elif option.find("serial:") == 0:
                     build_sh_spec['serial']=option.replace("serial:","")
                 elif option == "no-hangcheck":
-                    build_sh_spec['-k'].append('hangcheck_reboot=0')
+                    build_sh_spec['kargs'].append('hcheck_reboot=0')
+                    build_sh_spec['kargs'].append('debug')
                 else:
                     raise PLCInvalidArgument, "unknown option %s"%option
 
@@ -360,6 +361,13 @@ class GetBootMedium(Method):
                         raise PLCPermissionDenied, "Could not create dir %s"%filedir
 
         
+        # log call
+        if node:
+            self.message='GetBootMedium on node %s - action=%s'%(nodename,action)
+            self.event_objects={'Node': [ node ['node_id'] ]}
+        else:
+            self.message='GetBootMedium - generic - action=%s'%action
+
         ### generic media
         if action == 'generic-iso' or action == 'generic-usb':
             if options:
@@ -432,8 +440,8 @@ class GetBootMedium(Method):
                 if "serial" in build_sh_spec: 
                     build_sh_options += " -s %s"%build_sh_spec['serial']
                 
-                for k_option in build_sh_spec['-k']:
-                    build_sh_options += " -k %s"%k_option
+                for karg in build_sh_spec['kargs']:
+                    build_sh_options += ' -k "%s"'%karg
 
                 log_file="%s.log"%node_image
                 # invoke build.sh
@@ -441,7 +449,7 @@ class GetBootMedium(Method):
                                                                          floppy_file,
                                                                          node_image,
                                                                          type,
-                                                                         serial_arg,
+                                                                         build_sh_options,
                                                                          log_file)
                 if self.DEBUG:
                     print 'build command:',build_command