Merge pull request #1090 from jremmet/WIP/uuu

labgrid/driver/usbloader: fix uuu command

Author: jluebbe

doc/configuration.rst

@@ -2214,7 +2214,7 @@ Implements:
 Arguments:
   - image (str): optional, key in :ref:`images <labgrid-device-config-images>` containing the path
     of an image to bootstrap onto the target
-  - cmd (str, default="spl"): single command used for mfgtool
+  - script (str): run built-in script with "uuu -b", called with image as arg0
 
 USBStorageDriver
 ~~~~~~~~~~~~~~~~

labgrid/driver/usbloader.py

@@ -153,7 +153,7 @@ class UUUDriver(Driver, BootstrapProtocol):
     }
 
     image = attr.ib(default=None)
-    cmd = attr.ib(default='spl', validator=attr.validators.instance_of(str))
+    script = attr.ib(default='', validator=attr.validators.instance_of(str))
 
     def __attrs_post_init__(self):
         super().__attrs_post_init__()
@@ -177,8 +177,10 @@ def load(self, filename=None):
         mf = ManagedFile(filename, self.loader)
         mf.sync_to_resource()
 
+        cmd = ['-b', self.script] if self.script else []
+
         processwrapper.check_output(
-            self.loader.command_prefix + [self.tool, mf.get_remote_path(), self.cmd]
+            self.loader.command_prefix + [self.tool] + cmd + [mf.get_remote_path()]
         )