Support cramfs and serial images.

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

diff --git a/PLC/Methods/GetBootMedium.py b/PLC/Methods/GetBootMedium.py
index b3017f9..db60dca 100644 (file)
--- a/PLC/Methods/GetBootMedium.py
+++ b/PLC/Methods/GetBootMedium.py
@@ -112,12 +112,13 @@ class GetBootMedium(Method):
               Node.fields['hostname']),
         Parameter (str, "Action mode, expected in " + "|".join(boot_medium_actions)),
         Parameter (str, "Empty string for verbatim result, resulting file full path otherwise"),
+        Parameter ([str], "Options"),
         ]
 
     returns = Parameter(str, "Node boot medium, either inlined, or filename, depending to the filename parameter")
 
     BOOTCDDIR = "/usr/share/bootcd/"
-    BOOTCUSTOM = "/usr/share/bootcd/bootcustom.sh"
+    BOOTCDBUILD = "/usr/share/bootcd/build.sh"
     GENERICDIR = "/var/www/html/download/"
     NODEDIR = "/var/tmp/bootmedium/results"
     WORKDIR = "/var/tmp/bootmedium/work"
@@ -230,19 +231,32 @@ class GetBootMedium(Method):
         if not self.DEBUG:
             os.system("rm -rf %s"%tempdir)
 
-    def call(self, auth, node_id_or_hostname, action, filename):
+    def call(self, auth, node_id_or_hostname, action, filename, options = []):
 
         ### check action
         if action not in boot_medium_actions:
             raise PLCInvalidArgument, "Unknown action %s"%action
 
-        ### compute file suffix 
+        ### compute file suffix and type
         if action.find("-iso") >= 0 :
             suffix=".iso"
+            type = ["iso"]
         elif action.find("-usb") >= 0:
             suffix=".usb"
+            type = ["usb"]
         else:
             suffix=".txt"
+            type = ["txt"]
+
+        if type != "txt":
+            if 'serial' in options:
+                suffix = "-serial" + suffix
+                type.insert(1, "serial")
+            if 'cramfs' in options:
+                suffix = "-cramfs" + suffix
+                # XXX must be the same index as above
+                type.insert(1, "cramfs")
+        type = "_".join(type)
 
         ### compute a 8 bytes random number
         tempbytes = random.sample (xrange(0,256), 8);
@@ -337,15 +351,9 @@ class GetBootMedium(Method):
 
             ### check we've got required material
             version = self.bootcd_version()
-            generic_name = "%s-BootCD-%s%s"%(self.api.config.PLC_NAME,
-                                             version,
-                                             suffix)
-            generic_path = "%s/%s" % (self.GENERICDIR,generic_name)
-            if not os.path.isfile(generic_path):
-                raise PLCAPIError, "Cannot locate generic medium %s"%generic_path
             
-            if not os.path.isfile(self.BOOTCUSTOM):
-                raise PLCAPIError, "Cannot locate bootcustom script %s"%self.BOOTCUSTOM
+            if not os.path.isfile(self.BOOTCDBUILD):
+                raise PLCAPIError, "Cannot locate bootcd/build.sh script %s"%self.BOOTCDBUILD
 
             # need a temporary area
             tempdir = "%s/%s"%(self.WORKDIR,nodename)
@@ -365,20 +373,22 @@ class GetBootMedium(Method):
                 except:
                     raise PLCPermissionDenied, "Could not write into %s"%node_floppy
 
-                # invoke bootcustom
-                bootcustom_command = 'sudo %s -C "%s" "%s" "%s"'%(self.BOOTCUSTOM,
-                                                                  tempdir,
-                                                                  generic_path,
-                                                                  node_floppy)
+                node_image = "%s/%s"%(tempdir,nodename)
+                # invoke build.sh
+                build_command = '%s -f "%s" -O "%s" -t "%s" &> %s.log' % (self.BOOTCDBUILD,
+                                                                          node_floppy,
+                                                                          node_image,
+                                                                          type,
+                                                                          node_image)
                 if self.DEBUG:
-                    print 'bootcustom command:',bootcustom_command
-                ret=os.system(bootcustom_command)
+                    print 'build command:',build_command
+                ret=os.system(build_command)
                 if ret != 0:
-                    raise PLCPermissionDenied,"bootcustom.sh failed to create node-specific medium"
+                    raise PLCPermissionDenied,"build.sh failed to create node-specific medium"
 
-                node_image = "%s/%s%s"%(tempdir,nodename,suffix)
+                node_image += suffix
                 if not os.path.isfile (node_image):
-                    raise PLCAPIError,"Unexpected location of bootcustom output - %s"%node_image
+                    raise PLCAPIError,"Unexpected location of build.sh output - %s"%node_image
             
                 # cache result
                 if filename: