switch cloud images permanently to grub2
The main reason for cloud to use extlinux is the size of deps being pulled in by grub2-tools. This will be fixed in F-26 with the ability to use grub2/grub2-efi without the tools package and it's deps fixing this issue for good. There will no doubt need to be be some tweaking required here. We need grub2 in cloud images for non x86 as well as for the increasing x86 cloud platforms that require the support of uEFI which extlinux doesn't support. Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
This commit is contained in:
parent
d8b59962cd
commit
4ed12a7027
@ -36,20 +36,14 @@ 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=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
|
||||
|
||||
zerombr
|
||||
clearpart --all
|
||||
#
|
||||
# We need to disable 64bit options here or extlinux won't work.
|
||||
# See: http://www.syslinux.org/wiki/index.php/Filesystem#ext4
|
||||
# and
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1369934
|
||||
#
|
||||
part / --fstype ext4 --grow --mkfsoptions="-O ^64bit"
|
||||
part / --fstype ext4 --grow
|
||||
|
||||
%include fedora-repo.ks
|
||||
|
||||
@ -88,7 +82,7 @@ which
|
||||
#-kbd
|
||||
-uboot-tools
|
||||
-kernel
|
||||
-grub2
|
||||
grub2
|
||||
|
||||
%end
|
||||
|
||||
@ -242,14 +236,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
|
||||
|
||||
# FIXME: is this still needed?
|
||||
echo "Fixing SELinux contexts."
|
||||
touch /var/log/cron
|
||||
|
Loading…
Reference in New Issue
Block a user