diff options
Diffstat (limited to 'scripts/lib/wic/plugins')
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 4 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 8 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 22c7b0a33e..400e3a2df8 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -61,7 +61,7 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" - if cr._ptable_format in ('msdos', 'gpt'): + if cr.ptable_format in ('msdos', 'gpt'): rootstr = rootdev else: raise ImageError("Unsupported partition table format found") @@ -106,7 +106,7 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" - if cr._ptable_format in ('msdos', 'gpt'): + if cr.ptable_format in ('msdos', 'gpt'): rootstr = rootdev else: raise ImageError("Unsupported partition table format found") diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index ab62b7a9e9..1c3c6e605c 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -44,12 +44,12 @@ class BootimgPcbiosPlugin(SourcePlugin): disk image. In this case, we install the MBR. """ mbrfile = "%s/syslinux/" % bootimg_dir - if cr._ptable_format == 'msdos': + if cr.ptable_format == 'msdos': mbrfile += "mbr.bin" - elif cr._ptable_format == 'gpt': + elif cr.ptable_format == 'gpt': mbrfile += "gptmbr.bin" else: - msger.error("Unsupported partition table: %s" % cr._ptable_format) + msger.error("Unsupported partition table: %s" % cr.ptable_format) if not os.path.exists(mbrfile): msger.error("Couldn't find %s. If using the -e option, do you have the right MACHINE set in local.conf? If not, is the bootimg_dir path correct?" % mbrfile) @@ -104,7 +104,7 @@ class BootimgPcbiosPlugin(SourcePlugin): kernel = "/vmlinuz" syslinux_conf += "KERNEL " + kernel + "\n" - if cr._ptable_format in ('msdos', 'gpt'): + if cr.ptable_format in ('msdos', 'gpt'): rootstr = rootdev else: raise ImageError("Unsupported partition table format found") diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py index cdd7c84c12..50b221382c 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -101,7 +101,7 @@ class RootfsPlugin(SourcePlugin): syslinux_conf += "LABEL linux\n" syslinux_conf += " KERNEL /boot/bzImage\n" - if image_creator._ptable_format in ('msdos', 'gpt'): + if image_creator.ptable_format in ('msdos', 'gpt'): rootstr = rootdev else: raise ImageError("Unsupported partition table format found") @@ -170,13 +170,13 @@ class RootfsPlugin(SourcePlugin): disk image. In this case, we install the MBR. """ mbrfile = os.path.join(native_sysroot, "usr/share/syslinux/") - if image_creator._ptable_format == 'msdos': + if image_creator.ptable_format == 'msdos': mbrfile += "mbr.bin" - elif image_creator._ptable_format == 'gpt': + elif image_creator.ptable_format == 'gpt': mbrfile += "gptmbr.bin" else: msger.error("Unsupported partition table: %s" % \ - image_creator._ptable_format) + image_creator.ptable_format) if not os.path.exists(mbrfile): msger.error("Couldn't find %s. Has syslinux-native been baked?" % mbrfile) |