[Fedora-spins] [spin-kickstarts/f21] Revert "dd extlinux mbr during post as temporary workaround for bug #1147998"

[Bruno Wolff III]

commit de82df00d21651f0a7831d953dc7317f663407fc
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Wed Oct 15 06:26:48 2014 -0500

    Revert "dd extlinux mbr during post as temporary workaround for bug #1147998"
    
    This reverts commit 58b06553fadb53c95f83915e81db1379e3dc5f36.
    
    We need to go back to the broken merge.

 fedora-cloud-atomic.ks       |    9 ---------
 fedora-cloud-base.ks         |    8 --------
 fedora-cloud-bigdata.ks      |    7 -------
 fedora-cloud-experimental.ks |    8 --------
 4 files changed, 0 insertions(+), 32 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index 2680b19..42fed30 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -131,15 +131,6 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
-
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
 dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index a61e82e..1cbfdc4 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -194,14 +194,6 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*
 
 
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index 1a9ef6a..b8315bb 100644
--- a/fedora-cloud-bigdata.ks
+++ b/fedora-cloud-bigdata.ks
@@ -200,13 +200,6 @@ echo "-----------------------------------------------------------------------"
 # Note that running rpm recreates the rpm db files which aren't needed/wanted
 rm -f /var/lib/rpm/__db*
 
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
 
 echo "Fixing SELinux contexts."
 touch /var/log/cron
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index fb902a5..b865c4c 100644
--- a/fedora-cloud-experimental.ks
+++ b/fedora-cloud-experimental.ks
@@ -192,14 +192,6 @@ echo "-----------------------------------------------------------------------"
 rm -f /var/lib/rpm/__db*
 
 
-# This is a temporary workaround for
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1147998>
-# where sfdisk seems to be messing up the mbr.
-# Long-term fix is to address this in anaconda directly and remove this.
-# <https://bugzilla.redhat.com/show_bug.cgi?id=1015931>
-dd if=/usr/share/syslinux/mbr.bin of=/dev/vda
-
-
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log