diff options
Diffstat (limited to 'scripts/lib/mic/plugins/source/bootimg-pcbios.py')
-rw-r--r-- | scripts/lib/mic/plugins/source/bootimg-pcbios.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/scripts/lib/mic/plugins/source/bootimg-pcbios.py b/scripts/lib/mic/plugins/source/bootimg-pcbios.py index 9959645606..34343205ac 100644 --- a/scripts/lib/mic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/mic/plugins/source/bootimg-pcbios.py | |||
@@ -50,9 +50,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
50 | disk image. In this case, we install the MBR. | 50 | disk image. In this case, we install the MBR. |
51 | """ | 51 | """ |
52 | mbrfile = "%s/syslinux/" % bootimg_dir | 52 | mbrfile = "%s/syslinux/" % bootimg_dir |
53 | if cr._ptable_format == 'gpt': | 53 | if cr._ptable_format == 'msdos': |
54 | mbrfile += "gptmbr.bin" | ||
55 | else: | ||
56 | mbrfile += "mbr.bin" | 54 | mbrfile += "mbr.bin" |
57 | 55 | ||
58 | if not os.path.exists(mbrfile): | 56 | if not os.path.exists(mbrfile): |
@@ -110,9 +108,7 @@ class BootimgPcbiosPlugin(SourcePlugin): | |||
110 | if cr._ptable_format == 'msdos': | 108 | if cr._ptable_format == 'msdos': |
111 | rootstr = rootdev | 109 | rootstr = rootdev |
112 | else: | 110 | else: |
113 | if not root_part_uuid: | 111 | raise MountError("Unsupported partition table format found") |
114 | raise MountError("Cannot find the root GPT partition UUID") | ||
115 | rootstr = "PARTUUID=%s" % root_part_uuid | ||
116 | 112 | ||
117 | syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) | 113 | syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) |
118 | 114 | ||