diff --git a/mantle/platform/qemu.go b/mantle/platform/qemu.go index 4c581b449a..15ac791b45 100644 --- a/mantle/platform/qemu.go +++ b/mantle/platform/qemu.go @@ -51,8 +51,6 @@ import ( "github.com/coreos/coreos-assembler/mantle/system" "github.com/coreos/coreos-assembler/mantle/system/exec" "github.com/pkg/errors" - - "golang.org/x/sys/unix" ) var ( @@ -859,19 +857,6 @@ func newGuestfish(arch, diskImagePath string, diskSectorSize int) (*coreosGuestf cmd := exec.Command("guestfish", guestfishArgs...) cmd.Env = append(os.Environ(), "LIBGUESTFS_BACKEND=direct") - // Hack to run with a wrapper on older P8 hardware running RHEL7 - switch arch { - case "ppc64le": - u := unix.Utsname{} - if err := unix.Uname(&u); err != nil { - return nil, errors.Wrapf(err, "detecting kernel information") - } - if strings.Contains(fmt.Sprintf("%s", u.Release), "el7") { - plog.Infof("Detected el7. Running using libguestfs-ppc64le-wrapper.sh") - cmd.Env = append(cmd.Env, "LIBGUESTFS_HV=/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh") - } - } - // make sure it inherits stderr so we see any error message cmd.Stderr = os.Stderr stdout, err := cmd.StdoutPipe() diff --git a/src/libguestfish.sh b/src/libguestfish.sh index 15fa66658f..d67036fa2a 100755 --- a/src/libguestfish.sh +++ b/src/libguestfish.sh @@ -11,14 +11,6 @@ export LIBGUESTFS_BACKEND=direct arch=$(uname -m) - -# Hack to run with a wrapper on older P8 hardware running RHEL7 -if [ "$arch" = "ppc64le" ] ; then - if [[ "$(uname -r)" =~ "el7" ]]; then - export LIBGUESTFS_HV="/usr/lib/coreos-assembler/libguestfs-ppc64le-wrapper.sh" - fi -fi - # Hack to give ppc64le more memory inside the libguestfs VM. # The compiled in default I see when running `guestfish get-memsize` # is 1280. We need this because we are seeing issues from diff --git a/src/libguestfs-ppc64le-wrapper.sh b/src/libguestfs-ppc64le-wrapper.sh deleted file mode 100644 index b089d54a59..0000000000 --- a/src/libguestfs-ppc64le-wrapper.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -exec qemu-system-ppc64 "$@" -machine pseries,accel=kvm:tcg,vsmt=8,cap-fwnmi=off