From 06dc0e52eba9e5daada1ec577708e63b6f4a409f Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 24 Nov 2016 18:45:11 +0000
Subject: [PATCH] Revert "builder: ppc64, ppc64le: Force add virtio-scsi
 driver."

It turns out that adding the virtio-scsi driver does not help
to fix the dracut problem.

This partially reverts commit f766c84c39aae5d4b03ad4d935700455a7c0ef9e,
keeping the change to index.
---
 builder/website/fedora-ppc64.sh   | 2 +-
 builder/website/fedora-ppc64le.sh | 5 ++---
 builder/website/rhel-ppc64.sh     | 7 -------
 builder/website/rhel-ppc64le.sh   | 7 -------
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/builder/website/fedora-ppc64.sh b/builder/website/fedora-ppc64.sh
index 44bc39605..c8eafe298 100755
--- a/builder/website/fedora-ppc64.sh
+++ b/builder/website/fedora-ppc64.sh
@@ -63,7 +63,7 @@ poweroff
 %post
 # Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-dracut --add-drivers virtio-scsi -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Ensure the installation is up-to-date:
 dnf -y --best upgrade
diff --git a/builder/website/fedora-ppc64le.sh b/builder/website/fedora-ppc64le.sh
index 75017610e..3b18c5bd3 100755
--- a/builder/website/fedora-ppc64le.sh
+++ b/builder/website/fedora-ppc64le.sh
@@ -61,10 +61,9 @@ poweroff
 %end
 
 %post
-# Rerun dracut for the installed kernel (not the running kernel)
-# and add virtio-scsi (RHBZ#1396217).
+# Rerun dracut for the installed kernel (not the running kernel):
 KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-dracut --add-drivers virtio-scsi -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
+dracut -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
 
 # Ensure the installation is up-to-date:
 dnf -y --best upgrade
diff --git a/builder/website/rhel-ppc64.sh b/builder/website/rhel-ppc64.sh
index 972641b8b..32148ae67 100755
--- a/builder/website/rhel-ppc64.sh
+++ b/builder/website/rhel-ppc64.sh
@@ -74,13 +74,6 @@ poweroff
 %packages
 @core
 %end
-
-%post
-# Rerun dracut for the installed kernel (not the running kernel)
-# and add virtio-scsi (RHBZ#1396217).
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-dracut --add-drivers virtio-scsi -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-%end
 EOF
 
 # Yum configuration.
diff --git a/builder/website/rhel-ppc64le.sh b/builder/website/rhel-ppc64le.sh
index 746cb5eb1..83e639140 100755
--- a/builder/website/rhel-ppc64le.sh
+++ b/builder/website/rhel-ppc64le.sh
@@ -74,13 +74,6 @@ poweroff
 %packages
 @core
 %end
-
-%post
-# Rerun dracut for the installed kernel (not the running kernel)
-# and add virtio-scsi (RHBZ#1396217).
-KERNEL_VERSION=$(rpm -q kernel --qf '%{version}-%{release}.%{arch}\n')
-dracut --add-drivers virtio-scsi -f /boot/initramfs-$KERNEL_VERSION.img $KERNEL_VERSION
-%end
 EOF
 
 # Yum configuration.