wic includs rootfs path in the final report. When fstab needs to be updated wic copies rootfs to a temporary location. This causes path to the copy of rootfs to appear in the final report.
Saved original rootfs path when rootfs is copied to include original path to the report. Signed-off-by: Ed Bartosh <[email protected]> --- scripts/lib/wic/plugins/imager/direct.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index f707365..e90f9f9 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -62,6 +62,7 @@ class DirectPlugin(ImagerPlugin): # parse possible 'rootfs=name' items self.rootfs_dir = dict(rdir.split('=') for rdir in rootfs_dir.split(' ')) + self.rootfs_dir_orig = None self.bootimg_dir = bootimg_dir self.kernel_dir = kernel_dir self.native_sysroot = native_sysroot @@ -165,6 +166,7 @@ class DirectPlugin(ImagerPlugin): new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) if new_rootfs: # rootfs was copied to update fstab + self.rootfs_dir_orig = self.rootfs_dir['ROOTFS_DIR'] self.rootfs_dir['ROOTFS_DIR'] = new_rootfs for part in self.parts: @@ -234,11 +236,14 @@ class DirectPlugin(ImagerPlugin): for part in self.parts: if part.rootfs_dir is None: continue + rootfs_dir = part.rootfs_dir if part.mountpoint == '/': suffix = ':' + if self.rootfs_dir_orig: + rootfs_dir = self.rootfs_dir_orig else: suffix = '["%s"]:' % (part.mountpoint or part.label) - msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), part.rootfs_dir) + msg += ' ROOTFS_DIR%s%s\n' % (suffix.ljust(20), rootfs_dir) msg += ' BOOTIMG_DIR: %s\n' % self.bootimg_dir msg += ' KERNEL_DIR: %s\n' % self.kernel_dir -- 2.1.4 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
