From 312479cf075fc614afb9588412c03d716c850ab6 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 8 Aug 2014 14:46:28 -0500 Subject: 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 Signed-off-by: Richard Purdie --- scripts/lib/mic/imager/direct.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'scripts/lib/mic/imager/direct.py') diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 17bfd01566..a4f5691f79 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, -- cgit v1.2.3-54-g00ecf