diff options
Diffstat (limited to 'scripts/lib/mic/imager')
-rw-r--r-- | scripts/lib/mic/imager/baseimager.py | 13 | ||||
-rw-r--r-- | scripts/lib/mic/imager/direct.py | 6 |
2 files changed, 5 insertions, 14 deletions
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): | |||
176 | 176 | ||
177 | runner.show('umount -l %s' % self.workdir) | 177 | runner.show('umount -l %s' % self.workdir) |
178 | 178 | ||
179 | def mount(self, base_on = None, cachedir = None): | 179 | def mount(self): |
180 | """Setup the target filesystem in preparation for an install. | 180 | """Setup the target filesystem in preparation for an install. |
181 | 181 | ||
182 | This function sets up the filesystem which the ImageCreator will | 182 | This function sets up the filesystem which the ImageCreator will |
@@ -184,20 +184,11 @@ class BaseImageCreator(object): | |||
184 | install root directory, bind mounts some system directories (e.g. /dev) | 184 | install root directory, bind mounts some system directories (e.g. /dev) |
185 | and writes out /etc/fstab. Other subclasses may also e.g. create a | 185 | and writes out /etc/fstab. Other subclasses may also e.g. create a |
186 | sparse file, format it and loopback mount it to the install root. | 186 | sparse file, format it and loopback mount it to the install root. |
187 | |||
188 | base_on -- a previous install on which to base this install; defaults | ||
189 | to None, causing a new image to be created | ||
190 | |||
191 | cachedir -- a directory in which to store the Yum cache; defaults to | ||
192 | None, causing a new cache to be created; by setting this | ||
193 | to another directory, the same cache can be reused across | ||
194 | multiple installs. | ||
195 | |||
196 | """ | 187 | """ |
197 | self.__setup_tmpdir() | 188 | self.__setup_tmpdir() |
198 | self.__ensure_builddir() | 189 | self.__ensure_builddir() |
199 | 190 | ||
200 | self._mount_instroot(base_on) | 191 | self._mount_instroot() |
201 | 192 | ||
202 | def unmount(self): | 193 | def unmount(self): |
203 | """Unmounts the target filesystem. | 194 | """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): | |||
217 | # | 217 | # |
218 | # Actual implemention | 218 | # Actual implemention |
219 | # | 219 | # |
220 | def _mount_instroot(self, base_on = None): | 220 | def _mount_instroot(self): |
221 | """ | 221 | """ |
222 | For 'wic', we already have our build artifacts and don't want | 222 | For 'wic', we already have our build artifacts and don't want |
223 | to loop mount anything to install into, we just create | 223 | to loop mount anything to install into, we just create |
@@ -296,7 +296,7 @@ class DirectImageCreator(BaseImageCreator): | |||
296 | 296 | ||
297 | self.__instimage.mount() | 297 | self.__instimage.mount() |
298 | 298 | ||
299 | def install(self, repo_urls=None): | 299 | def install(self): |
300 | """ | 300 | """ |
301 | Install fs images into partitions | 301 | Install fs images into partitions |
302 | """ | 302 | """ |
@@ -306,7 +306,7 @@ class DirectImageCreator(BaseImageCreator): | |||
306 | % (disk_name, full_path, disk['min_size'])) | 306 | % (disk_name, full_path, disk['min_size'])) |
307 | self.__instimage.install(full_path) | 307 | self.__instimage.install(full_path) |
308 | 308 | ||
309 | def configure(self, repodata = None): | 309 | def configure(self): |
310 | """ | 310 | """ |
311 | Configure the system image according to kickstart. | 311 | Configure the system image according to kickstart. |
312 | 312 | ||