From: Dennis Gilmore <[email protected]>

Signed-off-by: Dennis Gilmore <[email protected]>
(cherry picked from commit bc1f075e4110c5bad913936036b335bd217f6624)
---
 fedora-cloud-base.ks | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 3717eb2..331dbdd 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -116,9 +116,6 @@ passwd -l root
 # remove the user anaconda forces us to make
 userdel -r none
 
-# Kickstart specifies timeout in seconds; syslinux uses 10ths.
-# 0 means wait forever, so instead we'll go with 1.
-sed -i 's/^timeout 10/timeout 1/' /boot/extlinux/extlinux.conf
 
 # setup systemd to boot to the right runlevel
 echo -n "Setting default runlevel to multiuser text mode"
@@ -237,21 +234,12 @@ 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
-
 
 # FIXME: is this still needed?
 echo "Fixing SELinux contexts."
 touch /var/log/cron
 touch /var/log/boot.log
-chattr -i /boot/extlinux/ldlinux.sys
 /usr/sbin/fixfiles -R -a restore
-chattr +i /boot/extlinux/ldlinux.sys
 
 echo "Zeroing out empty space."
 # This forces the filesystem to reclaim space from deleted files
-- 
2.7.4
_______________________________________________
cloud mailing list
[email protected]
http://lists.fedoraproject.org/admin/lists/[email protected]

Reply via email to