Put filesystem uuids to parsed ks structures

Take the uuids generated upon initialisation of DiskMount subclasses
and make them accessible via the parsed ks structure and as
INSTALLERFW_PARTx_UUID variables.

Change-Id: Iea38a403cdd365ef54979073f9a9f53d2b60038d
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>

diff --git a/mic/imager/loop.py b/mic/imager/loop.py
index 8d26ad4..09f3a9e 100644 (file)
--- a/mic/imager/loop.py
+++ b/mic/imager/loop.py
@@ -154,6 +154,7 @@ class LoopImageCreator(BaseImageCreator):
                     'extopts': part.extopts or None,
                     'loop': None,  # to be created in _mount_instroot
                     'uuid': part.uuid or None,
+                    'kspart' : part,
                     })
             self._instloops = allloops
 
@@ -326,6 +327,7 @@ class LoopImageCreator(BaseImageCreator):
                  "extopts": None,
                  "loop": None,
                  "uuid": None,
+                 "kspart": None
                  })
 
         self._check_imgdir()
@@ -361,6 +363,11 @@ class LoopImageCreator(BaseImageCreator):
                 msger.verbose('Mounting image "%s" on "%s"' % (imgname, mp))
                 fs.makedirs(mp)
                 loop['loop'].mount()
+                # Make an autogenerated uuid avaialble in _get_post_scripts_env()
+                if loop['kspart'] and loop['kspart'].uuid is None and \
+                   loop['loop'].uuid:
+                    loop['kspart'].uuid = loop['loop'].uuid
+
             except MountError, e:
                 raise