diff options
Diffstat (limited to 'scripts/lib/wic/plugins/source/isoimage-isohybrid.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 1cee90637a..9472d8abb9 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -54,7 +54,7 @@ class IsoImagePlugin(SourcePlugin): | |||
54 | name = 'isoimage-isohybrid' | 54 | name = 'isoimage-isohybrid' |
55 | 55 | ||
56 | @classmethod | 56 | @classmethod |
57 | def do_configure_syslinux(cls, cr, cr_workdir): | 57 | def do_configure_syslinux(cls, creator, cr_workdir): |
58 | """ | 58 | """ |
59 | Create loader-specific (syslinux) config | 59 | Create loader-specific (syslinux) config |
60 | """ | 60 | """ |
@@ -64,9 +64,9 @@ class IsoImagePlugin(SourcePlugin): | |||
64 | else: | 64 | else: |
65 | splashline = "" | 65 | splashline = "" |
66 | 66 | ||
67 | options = cr.ks.handler.bootloader.appendLine | 67 | options = creator.ks.handler.bootloader.appendLine |
68 | 68 | ||
69 | timeout = kickstart.get_timeout(cr.ks, 10) | 69 | timeout = kickstart.get_timeout(creator.ks, 10) |
70 | 70 | ||
71 | syslinux_conf = "" | 71 | syslinux_conf = "" |
72 | syslinux_conf += "PROMPT 0\n" | 72 | syslinux_conf += "PROMPT 0\n" |
@@ -90,7 +90,7 @@ class IsoImagePlugin(SourcePlugin): | |||
90 | cfg.write(syslinux_conf) | 90 | cfg.write(syslinux_conf) |
91 | 91 | ||
92 | @classmethod | 92 | @classmethod |
93 | def do_configure_grubefi(cls, part, cr, cr_workdir): | 93 | def do_configure_grubefi(cls, part, creator, cr_workdir): |
94 | """ | 94 | """ |
95 | Create loader-specific (grub-efi) config | 95 | Create loader-specific (grub-efi) config |
96 | """ | 96 | """ |
@@ -100,13 +100,13 @@ class IsoImagePlugin(SourcePlugin): | |||
100 | else: | 100 | else: |
101 | splashline = "" | 101 | splashline = "" |
102 | 102 | ||
103 | options = cr.ks.handler.bootloader.appendLine | 103 | options = creator.ks.handler.bootloader.appendLine |
104 | 104 | ||
105 | grubefi_conf = "" | 105 | grubefi_conf = "" |
106 | grubefi_conf += "serial --unit=0 --speed=115200 --word=8 " | 106 | grubefi_conf += "serial --unit=0 --speed=115200 --word=8 " |
107 | grubefi_conf += "--parity=no --stop=1\n" | 107 | grubefi_conf += "--parity=no --stop=1\n" |
108 | grubefi_conf += "default=boot\n" | 108 | grubefi_conf += "default=boot\n" |
109 | timeout = kickstart.get_timeout(cr.ks, 10) | 109 | timeout = kickstart.get_timeout(creator.ks, 10) |
110 | grubefi_conf += "timeout=%s\n" % timeout | 110 | grubefi_conf += "timeout=%s\n" % timeout |
111 | grubefi_conf += "\n" | 111 | grubefi_conf += "\n" |
112 | grubefi_conf += "search --set=root --label %s " % part.label | 112 | grubefi_conf += "search --set=root --label %s " % part.label |
@@ -185,7 +185,7 @@ class IsoImagePlugin(SourcePlugin): | |||
185 | return initrd | 185 | return initrd |
186 | 186 | ||
187 | @classmethod | 187 | @classmethod |
188 | def do_stage_partition(cls, part, source_params, cr, cr_workdir, | 188 | def do_stage_partition(cls, part, source_params, creator, cr_workdir, |
189 | oe_builddir, bootimg_dir, kernel_dir, | 189 | oe_builddir, bootimg_dir, kernel_dir, |
190 | native_sysroot): | 190 | native_sysroot): |
191 | """ | 191 | """ |
@@ -231,7 +231,7 @@ class IsoImagePlugin(SourcePlugin): | |||
231 | exec_cmd("bitbake mtools-native") | 231 | exec_cmd("bitbake mtools-native") |
232 | 232 | ||
233 | @classmethod | 233 | @classmethod |
234 | def do_configure_partition(cls, part, source_params, cr, cr_workdir, | 234 | def do_configure_partition(cls, part, source_params, creator, cr_workdir, |
235 | oe_builddir, bootimg_dir, kernel_dir, | 235 | oe_builddir, bootimg_dir, kernel_dir, |
236 | native_sysroot): | 236 | native_sysroot): |
237 | """ | 237 | """ |
@@ -249,11 +249,11 @@ class IsoImagePlugin(SourcePlugin): | |||
249 | msger.debug("%s" % source_params) | 249 | msger.debug("%s" % source_params) |
250 | if 'image_name' in source_params and \ | 250 | if 'image_name' in source_params and \ |
251 | source_params['image_name'].strip(): | 251 | source_params['image_name'].strip(): |
252 | cr.name = source_params['image_name'].strip() | 252 | creator.name = source_params['image_name'].strip() |
253 | msger.debug("The name of the image is: %s" % cr.name) | 253 | msger.debug("The name of the image is: %s" % creator.name) |
254 | 254 | ||
255 | @classmethod | 255 | @classmethod |
256 | def do_prepare_partition(cls, part, source_params, cr, cr_workdir, | 256 | def do_prepare_partition(cls, part, source_params, creator, cr_workdir, |
257 | oe_builddir, bootimg_dir, kernel_dir, | 257 | oe_builddir, bootimg_dir, kernel_dir, |
258 | rootfs_dir, native_sysroot): | 258 | rootfs_dir, native_sysroot): |
259 | """ | 259 | """ |
@@ -353,7 +353,7 @@ class IsoImagePlugin(SourcePlugin): | |||
353 | exec_cmd(install_cmd) | 353 | exec_cmd(install_cmd) |
354 | 354 | ||
355 | if not os.path.isfile("%s/EFI/BOOT/boot.cfg" % bootimg_dir): | 355 | if not os.path.isfile("%s/EFI/BOOT/boot.cfg" % bootimg_dir): |
356 | cls.do_configure_grubefi(part, cr, bootimg_dir) | 356 | cls.do_configure_grubefi(part, creator, bootimg_dir) |
357 | 357 | ||
358 | # Builds bootx64.efi/bootia32.efi if ISODIR didn't exist or | 358 | # Builds bootx64.efi/bootia32.efi if ISODIR didn't exist or |
359 | # didn't contains it | 359 | # didn't contains it |
@@ -463,7 +463,7 @@ class IsoImagePlugin(SourcePlugin): | |||
463 | install_cmd = "install -d %s/isolinux" % isodir | 463 | install_cmd = "install -d %s/isolinux" % isodir |
464 | exec_cmd(install_cmd) | 464 | exec_cmd(install_cmd) |
465 | 465 | ||
466 | cls.do_configure_syslinux(cr, cr_workdir) | 466 | cls.do_configure_syslinux(creator, cr_workdir) |
467 | 467 | ||
468 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys " % syslinux_dir | 468 | install_cmd = "install -m 444 %s/syslinux/ldlinux.sys " % syslinux_dir |
469 | install_cmd += "%s/isolinux/ldlinux.sys" % isodir | 469 | install_cmd += "%s/isolinux/ldlinux.sys" % isodir |
@@ -508,7 +508,7 @@ class IsoImagePlugin(SourcePlugin): | |||
508 | part.set_source_file(iso_img) | 508 | part.set_source_file(iso_img) |
509 | 509 | ||
510 | @classmethod | 510 | @classmethod |
511 | def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir, | 511 | def do_install_disk(cls, disk, disk_name, creator, workdir, oe_builddir, |
512 | bootimg_dir, kernel_dir, native_sysroot): | 512 | bootimg_dir, kernel_dir, native_sysroot): |
513 | """ | 513 | """ |
514 | Called after all partitions have been prepared and assembled into a | 514 | Called after all partitions have been prepared and assembled into a |
@@ -516,9 +516,9 @@ class IsoImagePlugin(SourcePlugin): | |||
516 | utility for booting via BIOS from disk storage devices. | 516 | utility for booting via BIOS from disk storage devices. |
517 | """ | 517 | """ |
518 | 518 | ||
519 | full_path = cr._full_path(workdir, disk_name, "direct") | 519 | full_path = creator._full_path(workdir, disk_name, "direct") |
520 | iso_img = "%s.p1" % full_path | 520 | iso_img = "%s.p1" % full_path |
521 | full_path_iso = cr._full_path(workdir, disk_name, "iso") | 521 | full_path_iso = creator._full_path(workdir, disk_name, "iso") |
522 | 522 | ||
523 | isohybrid_cmd = "isohybrid -u %s" % iso_img | 523 | isohybrid_cmd = "isohybrid -u %s" % iso_img |
524 | msger.debug("running command: %s" % \ | 524 | msger.debug("running command: %s" % \ |