From fb2a162d8756ab69c9c29a0715b033f18620341d Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 8 Aug 2014 07:53:35 -0500 Subject: wic: Remove Mount object It doesn't do anything we need, so remove it and fix up callers/base classes. Signed-off-by: Tom Zanussi --- scripts/lib/mic/utils/fs_related.py | 16 ---------------- scripts/lib/mic/utils/partitionedfs.py | 4 +--- 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/mic/utils/fs_related.py b/scripts/lib/mic/utils/fs_related.py index e6e362d0ba..07a5ff995d 100644 --- a/scripts/lib/mic/utils/fs_related.py +++ b/scripts/lib/mic/utils/fs_related.py @@ -112,19 +112,3 @@ class DiskImage(Disk): exec_cmd(dd_cmd) self.device = self.image_file - - -class Mount: - """A generic base class to deal with mounting things.""" - def __init__(self, mountdir): - self.mountdir = mountdir - - def cleanup(self): - self.unmount() - - def mount(self, options = None): - pass - - def unmount(self): - pass - diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py index ef92125c98..50536b4fce 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py @@ -32,9 +32,8 @@ MBR_OVERHEAD = 1 # Size of a sector in bytes SECTOR_SIZE = 512 -class PartitionedMount(Mount): +class PartitionedMount: def __init__(self, mountdir): - Mount.__init__(self, mountdir) self.disks = {} self.partitions = [] self.mountOrder = [] @@ -316,7 +315,6 @@ class PartitionedMount(Mount): self.unmountOrder.reverse() def cleanup(self): - Mount.cleanup(self) if self.disks: for dev in self.disks.keys(): d = self.disks[dev] -- cgit 1.2.3-korg