Merge branch 'unpackfs-support-rename'

- support a "file" source
 - document how to use it to copy a single file with-rename to target

src/modules/unpackfs/main.py

@@ -52,6 +52,17 @@ class UnpackEntry:
     __slots__ = ['source', 'sourcefs', 'destination', 'copied', 'total']
 
     def __init__(self, source, sourcefs, destination):
+        """
+        @p source is the source file name (might be an image file, or
+            a directory, too)
+        @p sourcefs is a type indication; "file" is special, as is
+            "squashfs".
+        @p destination is where the files from the source go. This is
+            **already** prefixed by rootMountPoint, so should be a
+            valid absolute path within the host system.
+
+        The members copied and total are filled in by the copying process.
+        """
         self.source = source
         self.sourcefs = sourcefs
         self.destination = destination
@@ -85,7 +96,6 @@ def list_excludes(destination):
 
     return lst
 
-
 def file_copy(source, dest, progress_cb):
     """
     Extract given image using rsync.
@@ -374,17 +384,22 @@ def run():
 
     unpack = list()
 
+    is_first = True
     for entry in job.configuration["unpack"]:
         source = os.path.abspath(entry["source"])
         sourcefs = entry["sourcefs"]
         destination = os.path.abspath(root_mount_point + entry["destination"])
 
-        if not os.path.isdir(destination):
+        if not os.path.isdir(destination) and sourcefs != "file":
             utils.warning(("The destination \"{}\" in the target system is not a directory").format(destination))
-            return (_("Bad unsquash configuration"),
-                    _("The destination \"{}\" in the target system is not a directory").format(destination))
+            if is_first:
+                return (_("Bad unsquash configuration"),
+                        _("The destination \"{}\" in the target system is not a directory").format(destination))
+            else:
+                utils.debug(".. assuming that the previous targets will create that directory.")
 
         unpack.append(UnpackEntry(source, sourcefs, destination))
+        is_first = False
 
     unpackop = UnpackOperation(unpack)
 

src/modules/unpackfs/unpackfs.conf

@@ -60,8 +60,13 @@
 #    -   source: ../src/modules/dummycpp
 #        sourcefs: file
 #        destination: "/tmp/derp"
+#
+# The *destination* and *source* are handed off to rsync, so the semantics
+# of trailing slashes apply. In order to *rename* a file as it is
+# copied, specify one single file (e.g. CHANGES) and a full pathname
+# for its destination name, as in the example below.
 
 unpack:
     -   source: ../CHANGES
         sourcefs: file
-        destination: "/tmp"
+        destination: "/tmp/changes.txt"