diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct_plugin.py | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct_plugin.py b/scripts/lib/wic/plugins/imager/direct_plugin.py index 48588dbc55..1d0d3ff546 100644 --- a/scripts/lib/wic/plugins/imager/direct_plugin.py +++ b/scripts/lib/wic/plugins/imager/direct_plugin.py | |||
@@ -27,7 +27,6 @@ import os | |||
27 | import shutil | 27 | import shutil |
28 | import uuid | 28 | import uuid |
29 | import tempfile | 29 | import tempfile |
30 | import time | ||
31 | 30 | ||
32 | from time import strftime | 31 | from time import strftime |
33 | from os.path import basename, splitext | 32 | from os.path import basename, splitext |
@@ -307,19 +306,13 @@ class DirectImageCreator: | |||
307 | self.bootimg_dir, self.kernel_dir, self.native_sysroot) | 306 | self.bootimg_dir, self.kernel_dir, self.native_sysroot) |
308 | 307 | ||
309 | 308 | ||
310 | self._image.add_partition(part.disk_size, | 309 | self._image.add_partition(part.disk_size, part.disk, |
311 | part.disk, | 310 | part.mountpoint, part.source_file, |
312 | part.mountpoint, | 311 | part.fstype, part.label, |
313 | part.source_file, | 312 | fsopts=part.fsopts, boot=part.active, |
314 | part.fstype, | 313 | align=part.align, no_table=part.no_table, |
315 | part.label, | 314 | part_type=part.part_type, uuid=part.uuid, |
316 | fsopts=part.fsopts, | 315 | system_id=part.system_id) |
317 | boot=part.active, | ||
318 | align=part.align, | ||
319 | no_table=part.no_table, | ||
320 | part_type=part.part_type, | ||
321 | uuid=part.uuid, | ||
322 | system_id=part.system_id) | ||
323 | 316 | ||
324 | if fstab_path: | 317 | if fstab_path: |
325 | shutil.move(fstab_path + ".orig", fstab_path) | 318 | shutil.move(fstab_path + ".orig", fstab_path) |
@@ -443,4 +436,3 @@ class DirectImageCreator: | |||
443 | 436 | ||
444 | # remove work directory | 437 | # remove work directory |
445 | shutil.rmtree(self.workdir, ignore_errors=True) | 438 | shutil.rmtree(self.workdir, ignore_errors=True) |
446 | |||