diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-08 14:46:28 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:12 +0100 |
commit | 312479cf075fc614afb9588412c03d716c850ab6 (patch) | |
tree | ceea217eb099ac9fe675b8d771739eb8d3c4ef17 /scripts/lib/mic/imager | |
parent | 28453ae63cf00b1b23f0176241901cd1ad28d2e0 (diff) | |
download | ast2050-yocto-poky-312479cf075fc614afb9588412c03d716c850ab6.zip ast2050-yocto-poky-312479cf075fc614afb9588412c03d716c850ab6.tar.gz |
wic: Rename PartitionedMount
It's actually a container for disks and partitions, and wic doesn't
mount anything, so rename it to match what it really is.
(From OE-Core rev: 28c5249b4df46ba3ac227d0c4dc6e545b40dbaf3)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/imager')
-rw-r--r-- | scripts/lib/mic/imager/direct.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 17bfd01..a4f5691 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -31,7 +31,7 @@ import shutil from mic import kickstart, msger from mic.utils import fs_related, runner, misc -from mic.utils.partitionedfs import PartitionedMount +from mic.utils.partitionedfs import Image from mic.utils.errors import CreatorError, MountError from mic.imager.baseimager import BaseImageCreator from mic.utils.oe.misc import * @@ -226,7 +226,7 @@ class DirectImageCreator(BaseImageCreator): """ parts = self._get_parts() - self.__image = PartitionedMount() + self.__image = Image() for p in parts: # as a convenience, set source to the boot partition source @@ -237,12 +237,11 @@ class DirectImageCreator(BaseImageCreator): for p in parts: # need to create the filesystems in order to get their # sizes before we can add them and do the layout. - # PartitionedMount.create() actually calls __format_disks() - # to create the disk images and carve out the partitions, - # then self.install() calls PartitionedMount.install() - # which calls __install_partitition() for each partition - # to dd the fs into the partitions. - + # Image.create() actually calls __format_disks() to create + # the disk images and carve out the partitions, then + # self.assemble() calls Image.assemble() which calls + # __write_partitition() for each partition to dd the fs + # into the partitions. fstab = self.__write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) p.prepare(self, self.workdir, self.oe_builddir, self.rootfs_dir, |