diff options
Diffstat (limited to 'scripts/lib/wic/plugins')
-rw-r--r-- | scripts/lib/wic/plugins/imager/direct.py | 6 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 4 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 9c8a2304a7..5b20ca9c5b 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py | |||
@@ -32,7 +32,7 @@ import uuid | |||
32 | 32 | ||
33 | from time import strftime | 33 | from time import strftime |
34 | 34 | ||
35 | from wic.errors import ImageError, WicError | 35 | from wic.errors import WicError |
36 | from wic.filemap import sparse_copy | 36 | from wic.filemap import sparse_copy |
37 | from wic.ksparser import KickStart, KickStartError | 37 | from wic.ksparser import KickStart, KickStartError |
38 | from wic.plugin import pluginmgr | 38 | from wic.plugin import pluginmgr |
@@ -355,8 +355,8 @@ class PartitionedImage(): | |||
355 | # The --part-type can also be implemented for MBR partitions, | 355 | # The --part-type can also be implemented for MBR partitions, |
356 | # in which case it would map to the 1-byte "partition type" | 356 | # in which case it would map to the 1-byte "partition type" |
357 | # filed at offset 3 of the partition entry. | 357 | # filed at offset 3 of the partition entry. |
358 | raise ImageError("setting custom partition type is not " \ | 358 | raise WicError("setting custom partition type is not " \ |
359 | "implemented for msdos partitions") | 359 | "implemented for msdos partitions") |
360 | 360 | ||
361 | # Get the disk where the partition is located | 361 | # Get the disk where the partition is located |
362 | self.numpart += 1 | 362 | self.numpart += 1 |
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index 2ded2dac52..c3a0e4eb42 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py | |||
@@ -28,7 +28,7 @@ import logging | |||
28 | import os | 28 | import os |
29 | 29 | ||
30 | from wic.engine import get_custom_config | 30 | from wic.engine import get_custom_config |
31 | from wic.errors import ImageError, WicError | 31 | from wic.errors import WicError |
32 | from wic.utils import runner | 32 | from wic.utils import runner |
33 | from wic.pluginbase import SourcePlugin | 33 | from wic.pluginbase import SourcePlugin |
34 | from wic.utils.misc import (exec_cmd, exec_native_cmd, | 34 | from wic.utils.misc import (exec_cmd, exec_native_cmd, |
@@ -71,7 +71,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
71 | rcode = runner.show(['dd', 'if=%s' % mbrfile, | 71 | rcode = runner.show(['dd', 'if=%s' % mbrfile, |
72 | 'of=%s' % full_path, 'conv=notrunc']) | 72 | 'of=%s' % full_path, 'conv=notrunc']) |
73 | if rcode != 0: | 73 | if rcode != 0: |
74 | raise ImageError("Unable to set MBR to %s" % full_path) | 74 | raise WicError("Unable to set MBR to %s" % full_path) |
75 | 75 | ||
76 | @classmethod | 76 | @classmethod |
77 | def do_configure_partition(cls, part, source_params, creator, cr_workdir, | 77 | def do_configure_partition(cls, part, source_params, creator, cr_workdir, |
diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index 4cc3a39856..cf0eec2fe3 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | |||
@@ -22,7 +22,7 @@ import logging | |||
22 | import os | 22 | import os |
23 | import re | 23 | import re |
24 | 24 | ||
25 | from wic.errors import ImageError, WicError | 25 | from wic.errors import WicError |
26 | from wic.utils import runner | 26 | from wic.utils import runner |
27 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd | 27 | from wic.utils.misc import get_bitbake_var, exec_cmd, exec_native_cmd |
28 | from wic.pluginbase import SourcePlugin | 28 | from wic.pluginbase import SourcePlugin |
@@ -210,4 +210,4 @@ class RootfsPlugin(SourcePlugin): | |||
210 | 210 | ||
211 | ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) | 211 | ret_code = runner.show(['dd', 'if=%s' % mbrfile, 'of=%s' % full_path, 'conv=notrunc']) |
212 | if ret_code != 0: | 212 | if ret_code != 0: |
213 | raise ImageError("Unable to set MBR to %s" % full_path) | 213 | raise WicError("Unable to set MBR to %s" % full_path) |