X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=source%2FBootManager.py;h=c0cb6c1ec59df8bb0d428e5ae6ddf2fa254e8f11;hb=d2a68fb4fb96b6f0546a82a36c5a99374a96fd0b;hp=714aa15cbb15b1f5860f7a8d24dd5fde0b38677c;hpb=373ed1b705da6b5eb52295d4215857ff923f0815;p=bootmanager.git

diff --git a/source/BootManager.py b/source/BootManager.py
index 714aa15..c0cb6c1 100755
--- a/source/BootManager.py
+++ b/source/BootManager.py
@@ -124,11 +124,24 @@ class log:
             hostname= self.VARS['INTERFACE_SETTINGS']['hostname'] + "." + \
                       self.VARS['INTERFACE_SETTINGS']['domainname']
             bs_request = BootServerRequest.BootServerRequest(self.VARS)
-            bs_request.MakeRequest(PartialPath = self.VARS['UPLOAD_LOG_SCRIPT'],
-                                   GetVars = None, PostVars = None,
-                                   FormData = ["log=@" + self.OutputFilePath,
-                                   "hostname=" + hostname, "type=bm.log"],
-                                   DoSSL = True, DoCertCheck = True)
+            try:
+                # this was working until f10
+                bs_request.MakeRequest(PartialPath = self.VARS['UPLOAD_LOG_SCRIPT'],
+                                       GetVars = None, PostVars = None,
+                                       DoSSL = True, DoCertCheck = True,
+                                       FormData = ["log=@" + self.OutputFilePath,
+                                                   "hostname=" + hostname, 
+                                                   "type=bm.log"])
+            except:
+                # new pycurl
+                import pycurl
+                bs_request.MakeRequest(PartialPath = self.VARS['UPLOAD_LOG_SCRIPT'],
+                                       GetVars = None, PostVars = None,
+                                       DoSSL = True, DoCertCheck = True,
+                                       FormData = [('log',(pycurl.FORM_FILE, self.OutputFilePath)),
+                                                   ("hostname",hostname),
+                                                   ("type","bm.log")])
+
 
 ##############################
 class BootManager:
@@ -211,7 +224,6 @@ class BootManager:
             ret = ValidateNodeInstall.Run( self.VARS, self.LOG )
             if ret == 1:
                 WriteModprobeConfig.Run( self.VARS, self.LOG )
-                MakeInitrd.Run( self.VARS, self.LOG )
                 WriteNetworkConfig.Run( self.VARS, self.LOG )
                 CheckForNewDisks.Run( self.VARS, self.LOG )
                 SendHardwareConfigToPLC.Run( self.VARS, self.LOG )