From 5e92d78866f41b1156129a590e1ed6278bfecd2f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 8 Aug 2014 14:46:28 -0500 Subject: [PATCH] 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 +++++++-------- scripts/lib/mic/plugins/imager/direct_plugin.py | 1 - scripts/lib/mic/plugins/source/bootimg-efi.py | 1 - scripts/lib/mic/plugins/source/bootimg-pcbios.py | 1 - scripts/lib/mic/plugins/source/rootfs.py | 1 - scripts/lib/mic/utils/partitionedfs.py | 8 +++++++- 6 files changed, 14 insertions(+), 13 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, diff --git a/scripts/lib/mic/plugins/imager/direct_plugin.py b/scripts/lib/mic/plugins/imager/direct_plugin.py index ff30f09..c05a400 100644 --- a/scripts/lib/mic/plugins/imager/direct_plugin.py +++ b/scripts/lib/mic/plugins/imager/direct_plugin.py @@ -34,7 +34,6 @@ from mic import msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr from mic.plugin import pluginmgr -from mic.utils.partitionedfs import PartitionedMount import mic.imager.direct as direct from mic.pluginbase import ImagerPlugin diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py index d4a7771..e880358 100644 --- a/scripts/lib/mic/plugins/source/bootimg-efi.py +++ b/scripts/lib/mic/plugins/source/bootimg-efi.py @@ -33,7 +33,6 @@ from mic import kickstart, msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr from mic.plugin import pluginmgr -from mic.utils.partitionedfs import PartitionedMount import mic.imager.direct as direct from mic.pluginbase import SourcePlugin from mic.utils.oe.misc import * diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 3434320..53ed7c3 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py @@ -33,7 +33,6 @@ from mic import kickstart, msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr from mic.plugin import pluginmgr -from mic.utils.partitionedfs import PartitionedMount import mic.imager.direct as direct from mic.pluginbase import SourcePlugin from mic.utils.oe.misc import * diff --git a/scripts/lib/mic/plugins/source/rootfs.py b/scripts/lib/mic/plugins/source/rootfs.py index 8cb576d..8ebf62c 100644 --- a/scripts/lib/mic/plugins/source/rootfs.py +++ b/scripts/lib/mic/plugins/source/rootfs.py @@ -34,7 +34,6 @@ from mic import kickstart, msger from mic.utils import misc, fs_related, errors, runner, cmdln from mic.conf import configmgr from mic.plugin import pluginmgr -from mic.utils.partitionedfs import PartitionedMount import mic.imager.direct as direct from mic.pluginbase import SourcePlugin from mic.utils.oe.misc import * diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py index 2f950a6..f4ce4a9 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py @@ -32,7 +32,13 @@ MBR_OVERHEAD = 1 # Size of a sector in bytes SECTOR_SIZE = 512 -class PartitionedMount: +class Image: + """ + Generic base object for an image. + + An Image is a container for a set of DiskImages and associated + partitions. + """ def __init__(self): self.disks = {} self.partitions = [] -- 2.7.4