Merge some F23 commits to F24 fedora-cloud-base.ks

[Dusty Mabe]

NOTE: Please merge this to the f24 branch

In F23 we added some commits to make the build work. These commits
were never merged to master (rawhide) so they didn't make it to F24
when the kickstarts were created. We need these commits to make the
F24 fedora-cloud-base.ks more closely match the build of F23.

[PATCH 1/3] switch the cloud base image to grub for Alpha

[Dusty Mabe]

From: Dennis Gilmore

Signed-off-by: Dennis Gilmore 
(cherry picked from commit 932524c849524eabe9ec8b56ed4f85396a22b0ad)
---
 fedora-cloud-base.ks | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 27a9106..3717eb2 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -36,7 +36,7 @@ user --name=none

firewall --disabled

-bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8"

network --bootproto=dhcp --device=link --activate --onboot=on
 services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final

[PATCH 2/3] remove the hacks in %post for extlinux

[Dusty Mabe]

From: Dennis Gilmore

Signed-off-by: Dennis Gilmore 
(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

[PATCH 3/3] do not remove grub2

[Dusty Mabe]

From: Dennis Gilmore

Signed-off-by: Dennis Gilmore 
(cherry picked from commit fb40fd6d03d1f10cfbc968387877d8ef6eaaf067)
---
 fedora-cloud-base.ks | 1 -
 1 file changed, 1 deletion(-)

diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 331dbdd..4e183b5 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -79,7 +79,6 @@ systemd-udev
 #-kbd
 -uboot-tools
 -kernel
--grub2

%end

[Dennis Gilmore]

On Monday, May 2, 2016 3:16:48 AM CDT Dusty Mabe wrote:
> NOTE: Please merge this to the f24 branch
>
> In F23 we added some commits to make the build work. These commits
> were never merged to master (rawhide) so they didn't make it to F24
> when the kickstarts were created. We need these commits to make the
> F24 fedora-cloud-base.ks more closely match the build of F23.

it was never moved to rawhide because it was only done due to extlinux not 
working. not because it was really desired to move to grub.

the intention was to go back to extlinux when it was working again

Dennis