Skip to content

Commit 3ab61dd

Browse files
committed
metal: drop workaround for ppc64le PXE bug
grub2-2.06-116.fc39 update is now available and it fixes the issue. The pxe-online-install.ppcfw & pxe-offline-install.4k.ppcfw tests pass without the workaround. Ref: #3370
1 parent 3df2b90 commit 3ab61dd

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

mantle/platform/metal.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -447,20 +447,6 @@ func (t *installerRun) completePxeSetup(kargs []string) error {
447447
`, t.kern.kernel, kargsStr, t.kern.initramfs)), 0777); err != nil {
448448
return errors.Wrap(err, "writing grub.cfg")
449449
}
450-
451-
// workaround for https://github.com/coreos/coreos-assembler/issues/3370
452-
// see: https://bugzilla.redhat.com/show_bug.cgi?id=2209435#c6
453-
if coreosarch.CurrentRpmArch() == "ppc64le" {
454-
subpath := filepath.Join(t.tftpdir, "boot/grub2/powerpc-ieee1275")
455-
cp_cmd := exec.Command("/usr/lib/coreos-assembler/cp-reflink", subpath, subpath+"-2")
456-
cp_cmd.Stderr = os.Stderr
457-
if err := cp_cmd.Run(); err != nil {
458-
return errors.Wrap(err, "running cp-reflink for pcp64le workaround")
459-
}
460-
if err := os.Rename(subpath+"-2", filepath.Join(subpath, "powerpc-ieee1275")); err != nil {
461-
return errors.Wrap(err, "rename() for pcp64le workaround")
462-
}
463-
}
464450
default:
465451
panic("Unhandled boottype " + t.pxe.boottype)
466452
}

0 commit comments

Comments
 (0)