From c6826272fc750d8d36d3e1a952ef8ae76dd7eff5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 28 Mar 2017 15:59:17 +0100 Subject: [PATCH] Fix the vagrant and bigdata cloud images With moving to grub2 we now need to remove the extlinux bits from the other cloud images. They were missed in the move Signed-off-by: Peter Robinson --- fedora-cloud-base-vagrant.ks | 2 +- fedora-cloud-base.ks | 6 ------ fedora-cloud-bigdata.ks | 8 +------- fedora-cloud-experimental.ks | 6 +----- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks index 72e30e7..94df7a8 100644 --- a/fedora-cloud-base-vagrant.ks +++ b/fedora-cloud-base-vagrant.ks @@ -19,7 +19,7 @@ rootpw vagrant # even on VirtualBox virt, we get a primary network device with "eth0" as the name # This simplifies things and allows a single disk image for both supported Vagrant # platforms (virtualbox and kvm) -bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" --extlinux +bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8 net.ifnames=0 biosdevname=0" %packages # The default koji Vagrantfile configuration uses rsync to sync files between diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 6fc5365..6bb6c30 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -121,10 +121,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" rm -f /etc/systemd/system/default.target @@ -242,9 +238,7 @@ rm -f /var/lib/rpm/__db* 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 diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks index 7ae98bc..fd67c89 100644 --- a/fedora-cloud-bigdata.ks +++ b/fedora-cloud-bigdata.ks @@ -23,7 +23,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=eth0 --activate --onboot=on services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -97,10 +97,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" rm -f /etc/systemd/system/default.target @@ -209,9 +205,7 @@ echo "Fixing SELinux contexts." touch /var/log/cron touch /var/log/boot.log mkdir -p /var/cache/yum -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 diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks index 63c7c45..16a3499 100644 --- a/fedora-cloud-experimental.ks +++ b/fedora-cloud-experimental.ks @@ -14,7 +14,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=eth0 --activate --onboot=on services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final @@ -88,10 +88,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" rm -f /etc/systemd/system/default.target