From d74e7d3fa693eb7037a57dfbd0c47bc53255316f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Thu, 7 Aug 2014 12:04:06 -0500 Subject: wic: Remove unused conf support Also fix up users such as imager functions. (From OE-Core rev: eb77b9c11bd9b8dc90aacfbd5b5bc5568a233525) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/mic/imager/baseimager.py | 13 ++----------- scripts/lib/mic/imager/direct.py | 6 +++--- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'scripts/lib/mic/imager') diff --git a/scripts/lib/mic/imager/baseimager.py b/scripts/lib/mic/imager/baseimager.py index 55f2deaf2c..0d591eaf43 100644 --- a/scripts/lib/mic/imager/baseimager.py +++ b/scripts/lib/mic/imager/baseimager.py @@ -176,7 +176,7 @@ class BaseImageCreator(object): runner.show('umount -l %s' % self.workdir) - def mount(self, base_on = None, cachedir = None): + def mount(self): """Setup the target filesystem in preparation for an install. This function sets up the filesystem which the ImageCreator will @@ -184,20 +184,11 @@ class BaseImageCreator(object): install root directory, bind mounts some system directories (e.g. /dev) and writes out /etc/fstab. Other subclasses may also e.g. create a sparse file, format it and loopback mount it to the install root. - - base_on -- a previous install on which to base this install; defaults - to None, causing a new image to be created - - cachedir -- a directory in which to store the Yum cache; defaults to - None, causing a new cache to be created; by setting this - to another directory, the same cache can be reused across - multiple installs. - """ self.__setup_tmpdir() self.__ensure_builddir() - self._mount_instroot(base_on) + self._mount_instroot() def unmount(self): """Unmounts the target filesystem. diff --git a/scripts/lib/mic/imager/direct.py b/scripts/lib/mic/imager/direct.py index 92473b5bb7..2e6914b86d 100644 --- a/scripts/lib/mic/imager/direct.py +++ b/scripts/lib/mic/imager/direct.py @@ -217,7 +217,7 @@ class DirectImageCreator(BaseImageCreator): # # Actual implemention # - def _mount_instroot(self, base_on = None): + def _mount_instroot(self): """ For 'wic', we already have our build artifacts and don't want to loop mount anything to install into, we just create @@ -296,7 +296,7 @@ class DirectImageCreator(BaseImageCreator): self.__instimage.mount() - def install(self, repo_urls=None): + def install(self): """ Install fs images into partitions """ @@ -306,7 +306,7 @@ class DirectImageCreator(BaseImageCreator): % (disk_name, full_path, disk['min_size'])) self.__instimage.install(full_path) - def configure(self, repodata = None): + def configure(self): """ Configure the system image according to kickstart. -- cgit v1.2.3-54-g00ecf