Delete system-kind plugins except for rootfs-tarball

Also delete the infrastructure for disk-based system-kinds
from builder2.py.

1 files changed, 0 insertions, 161 deletions

diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index bb791cb4..5de3366c 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -710,167 +710,6 @@ class Builder(object):  # pragma: no cover
         logging.debug('Builder.build: done')
         return built_artifacts
 
-class DiskImageBuilder(SystemKindBuilder):  # pragma: no cover
-
-    system_kind = 'disk'
-
-    def build_and_cache(self):
-        with self.build_watch('overall-build'):
-            arch = self.artifact.source.morphology['arch']
-
-            rootfs_name = self.artifact.source.morphology['name'] + '-rootfs'
-            rootfs_artifact = self.new_artifact(rootfs_name)
-            handle = self.local_artifact_cache.put(rootfs_artifact)
-            (image_file_fd, image_name) = \
-                tempfile.mkstemp(dir=self.app.settings['tempdir'])
-            try:
-                self._create_image(image_name)
-                self._partition_image(image_name)
-                self._install_mbr(arch, image_name)
-                partition = self._setup_device_mapping(image_name)
-
-                mount_point = None
-                try:
-                    self._create_fs(partition)
-                    mount_point = \
-                        self.staging_area.destdir(self.artifact.source)
-                    self._mount(partition, mount_point)
-                    factory_path = os.path.join(mount_point, 'factory')
-                    self._create_subvolume(factory_path)
-                    self.unpack_strata(factory_path)
-                    self.write_metadata(factory_path, rootfs_name)
-                    self.create_fstab(factory_path)
-                    self._create_bootloader_config(factory_path)
-                    self._create_subvolume_snapshot(
-                        mount_point, 'factory', 'factory-run')
-                    factory_run_path = os.path.join(mount_point,
-                                                    'factory-run')
-                    self._install_boot_files(arch, factory_run_path,
-                                             mount_point)
-                    self._install_bootloader(mount_point)
-                    self.copy_kernel_into_artifact_cache(factory_path)
-                except BaseException, e:
-                    logging.error(traceback.format_exc())
-                    self.app.status(msg='Error while building system',
-                                    error=True)
-                    self._unmount(mount_point)
-                    self._undo_device_mapping(image_name)
-                    if type(e) is IOError and e.errno==errno.ENOSPC:
-                        raise cliapp.AppException(
-                            'Ran out of space on %s disk image. Please '
-                            'increase the system\'s disk-size.' % rootfs_name)
-                    else:
-                        raise
-
-                self._unmount(mount_point)
-                self._undo_device_mapping(image_name)
-
-                self.app.status(msg='Compressing disk image',
-                                chatty=True)
-                with os.fdopen(image_file_fd, "rb") as ifh:
-                    ofh = gzip.GzipFile(
-                        fileobj=handle, filename='', mode="wb",
-                        compresslevel=1)
-                    shutil.copyfileobj(ifh, ofh, 1024 * 1024)
-                    ofh.close()
-
-            except BaseException, e:
-                logging.error('Caught exception: %s' % str(e))
-                logging.info('Removing unfinished disk image %s' % image_name)
-                os.remove(image_name)
-                logging.info('Removing unfinished file from cache')
-                handle.abort()
-                raise
-
-            os.remove(image_name)
-            handle.close()
-
-        self.save_build_times()
-        return [self.artifact]
-
-    def _create_image(self, image_name):
-        self.app.status(msg='Creating disk image %(filename)s',
-                        filename=image_name, chatty=True)
-        with self.build_watch('create-image'):
-            morphlib.fsutils.create_image(
-                self.app.runcmd, image_name,
-                self.artifact.source.morphology['disk-size'])
-
-    def _partition_image(self, image_name):
-        self.app.status(msg='Partitioning disk image %(filename)s',
-                        filename=image_name)
-        with self.build_watch('partition-image'):
-            morphlib.fsutils.partition_image(self.app.runcmd, image_name)
-
-    def _install_mbr(self, arch, image_name):
-        '''Placeholder method.'''
-
-    def _setup_device_mapping(self, image_name):
-        self.app.status(msg='Device mapping partitions in %(filename)s',
-                        filename=image_name, chatty=True)
-        with self.build_watch('setup-device-mapper'):
-            return morphlib.fsutils.setup_device_mapping(self.app.runcmd,
-                                                         image_name)
-
-    def _create_fs(self, partition):
-        self.app.status(msg='Creating filesystem on %(partition)s',
-                        partition=partition, chatty=True)
-        with self.build_watch('create-filesystem'):
-            morphlib.fsutils.create_fs(self.app.runcmd, partition)
-
-    def _mount(self, partition, mount_point):
-        self.app.status(msg='Mounting %(partition)s on %(mount_point)s',
-                        partition=partition, mount_point=mount_point,
-                        chatty=True)
-        with self.build_watch('mount-filesystem'):
-            morphlib.fsutils.mount(self.app.runcmd, partition, mount_point)
-
-    def _create_subvolume(self, path):
-        self.app.status(msg='Creating subvolume %(path)s',
-                        path=path, chatty=True)
-        with self.build_watch('create-factory-subvolume'):
-            self.app.runcmd(['btrfs', 'subvolume', 'create', path])
-
-    def _create_bootloader_config(self, path):
-        '''Placeholder method.'''
-
-    def _create_subvolume_snapshot(self, path, source, target):
-        self.app.status(msg='Creating subvolume snapshot '
-                            '%(source)s to %(target)s',
-                        source=source, target=target, chatty=True)
-        with self.build_watch('create-runtime-snapshot'):
-            # sync needed for older versions of btrfs where files aren't
-            # flushed to disk before they have their contents snapshotted
-            self.app.runcmd(['sync'])
-            self.app.runcmd(['btrfs', 'subvolume', 'snapshot', source, target],
-                            cwd=path)
-
-    def _install_boot_files(self, arch, sourcefs, targetfs):
-        with self.build_watch('install-boot-files'):
-            if arch in ('x86', 'x86_64'):
-                self.app.status(msg='Installing boot files into root volume',
-                                chatty=True)
-                os.mkdir(os.path.join(targetfs, 'boot'))
-                shutil.copy2(os.path.join(sourcefs, 'boot', 'vmlinuz'),
-                             os.path.join(targetfs, 'boot', 'vmlinuz'))
-                shutil.copy2(os.path.join(sourcefs, 'boot', 'System.map'),
-                             os.path.join(targetfs, 'boot', 'System.map'))
-
-    def _install_bootloader(self, path):
-        '''Placeholder method.'''
-
-    def _unmount(self, mount_point):
-        with self.build_watch('unmount-filesystem'):
-            if mount_point is not None:
-                self.app.status(msg='Unmounting %(mount_point)s',
-                                mount_point=mount_point, chatty=True)
-                morphlib.fsutils.unmount(self.app.runcmd, mount_point)
-
-    def _undo_device_mapping(self, image_name):
-        self.app.status(msg='Undoing device mappings for %(filename)s',
-                        filename=image_name, chatty=True)
-        with self.build_watch('undo-device-mapper'):
-            morphlib.fsutils.undo_device_mapping(self.app.runcmd, image_name)
 
 class EmptyStratumError(cliapp.AppException):