diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/micboot.py | 3 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 15 | ||||
| -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 | ||||
| -rw-r--r-- | scripts/lib/wic/utils/partitionedfs.py | 4 |
5 files changed, 8 insertions, 30 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/micboot.py b/scripts/lib/wic/kickstart/custom_commands/micboot.py index d162142506..358b0ea9cd 100644 --- a/scripts/lib/wic/kickstart/custom_commands/micboot.py +++ b/scripts/lib/wic/kickstart/custom_commands/micboot.py @@ -44,6 +44,7 @@ class Mic_Bootloader(F8_Bootloader): def _getParser(self): op = F8_Bootloader._getParser(self) op.add_option("--menus", dest="menus") - op.add_option("--ptable", dest="ptable", type="string") + op.add_option("--ptable", dest="ptable", choices=("msdos", "gpt"), + default="msdos") return op diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index 39ce9f375e..d3b8468c7b 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -60,13 +60,8 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" - if cr.ptable_format in ('msdos', 'gpt'): - rootstr = cr.rootdev - else: - raise ImageError("Unsupported partition table format found") - grubefi_conf += "linux %s root=%s rootwait %s\n" \ - % (kernel, rootstr, options) + % (kernel, cr.rootdev, options) grubefi_conf += "}\n" msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ @@ -104,16 +99,10 @@ class BootimgEFIPlugin(SourcePlugin): kernel = "/bzImage" - if cr.ptable_format in ('msdos', 'gpt'): - rootstr = cr.rootdev - else: - raise ImageError("Unsupported partition table format found") - boot_conf = "" boot_conf += "title boot\n" boot_conf += "linux %s\n" % kernel - boot_conf += "options LABEL=Boot root=%s %s\n" \ - % (rootstr, options) + boot_conf += "options LABEL=Boot root=%s %s\n" % (cr.rootdev, options) msger.debug("Writing gummiboot config %s/hdd/boot/loader/entries/boot.conf" \ % cr_workdir) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index dd49480141..5caffbc8e2 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -103,12 +103,8 @@ class BootimgPcbiosPlugin(SourcePlugin): kernel = "/vmlinuz" syslinux_conf += "KERNEL " + kernel + "\n" - if cr.ptable_format in ('msdos', 'gpt'): - rootstr = cr.rootdev - else: - raise ImageError("Unsupported partition table format found") - - syslinux_conf += "APPEND label=boot root=%s %s\n" % (rootstr, options) + syslinux_conf += "APPEND label=boot root=%s %s\n" % \ + (cr.rootdev, options) msger.debug("Writing syslinux config %s/hdd/boot/syslinux.cfg" \ % 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 90dac05dca..533eaa7bd1 100644 --- a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -100,12 +100,8 @@ class RootfsPlugin(SourcePlugin): syslinux_conf += "LABEL linux\n" syslinux_conf += " KERNEL /boot/bzImage\n" - if image_creator.ptable_format in ('msdos', 'gpt'): - rootstr = image_creator.rootdev - else: - raise ImageError("Unsupported partition table format found") - - syslinux_conf += " APPEND label=boot root=%s %s\n" % (rootstr, options) + syslinux_conf += " APPEND label=boot root=%s %s\n" % \ + (image_creator.rootdev, options) syslinux_cfg = os.path.join(image_creator.rootfs_dir['ROOTFS_DIR'], "boot", "syslinux.cfg") msger.debug("Writing syslinux config %s" % syslinux_cfg) diff --git a/scripts/lib/wic/utils/partitionedfs.py b/scripts/lib/wic/utils/partitionedfs.py index 1eb1f015d6..e093ec5778 100644 --- a/scripts/lib/wic/utils/partitionedfs.py +++ b/scripts/lib/wic/utils/partitionedfs.py @@ -122,10 +122,6 @@ class Image(object): msger.debug("Assigning %s partitions to disks" % ptable_format) - if ptable_format not in ('msdos', 'gpt'): - raise ImageError("Unknown partition table format '%s', supported " \ - "formats are: 'msdos'" % ptable_format) - if self._partitions_layed_out: return |