diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-08 15:11:31 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:12 +0100 |
commit | ff1aa2358eb31f21c3acdb980633f5bbc77bda77 (patch) | |
tree | 45c56fac452e19b46d51d445e886183f97f0e8c0 /scripts/lib/mic/plugins/source | |
parent | 312479cf075fc614afb9588412c03d716c850ab6 (diff) | |
download | poky-ff1aa2358eb31f21c3acdb980633f5bbc77bda77.tar.gz |
wic: Rename MountError
wic doesn't mount anything, so can't have a mount error; rename it to
something more appropriate.
(From OE-Core rev: e1edee656fc9c0a791c0eb62796d1afa483be34e)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/plugins/source')
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-efi.py | 2 | ||||
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/scripts/lib/mic/plugins/source/bootimg-efi.py b/scripts/lib/mic/plugins/source/bootimg-efi.py index e880358103..5b1a5332c4 100644 --- a/scripts/lib/mic/plugins/source/bootimg-efi.py +++ b/scripts/lib/mic/plugins/source/bootimg-efi.py | |||
@@ -77,7 +77,7 @@ class BootimgEFIPlugin(SourcePlugin): | |||
77 | if cr._ptable_format == 'msdos': | 77 | if cr._ptable_format == 'msdos': |
78 | rootstr = rootdev | 78 | rootstr = rootdev |
79 | else: | 79 | else: |
80 | raise MountError("Unsupported partition table format found") | 80 | raise ImageError("Unsupported partition table format found") |
81 | 81 | ||
82 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ | 82 | grubefi_conf += "linux %s root=%s rootwait %s\n" \ |
83 | % (kernel, rootstr, options) | 83 | % (kernel, rootstr, options) |
diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 53ed7c3195..959cf411bf 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py | |||
@@ -62,7 +62,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
62 | rc = runner.show(['dd', 'if=%s' % mbrfile, | 62 | rc = runner.show(['dd', 'if=%s' % mbrfile, |
63 | 'of=%s' % full_path, 'conv=notrunc']) | 63 | 'of=%s' % full_path, 'conv=notrunc']) |
64 | if rc != 0: | 64 | if rc != 0: |
65 | raise MountError("Unable to set MBR to %s" % full_path) | 65 | raise ImageError("Unable to set MBR to %s" % full_path) |
66 | 66 | ||
67 | @classmethod | 67 | @classmethod |
68 | def do_configure_partition(self, part, cr, cr_workdir, oe_builddir, | 68 | def do_configure_partition(self, part, cr, cr_workdir, oe_builddir, |
@@ -107,7 +107,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
107 | if cr._ptable_format == 'msdos': | 107 | if cr._ptable_format == 'msdos': |
108 | rootstr = rootdev | 108 | rootstr = rootdev |
109 | else: | 109 | else: |
110 | raise MountError("Unsupported partition table format found") | 110 | raise ImageError("Unsupported partition table format found") |
111 | 111 | ||
112 | syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) | 112 | syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) |
113 | 113 | ||