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 <pbrobinson@fedoraproject.org>
This commit is contained in:
Peter Robinson 2017-03-28 15:59:17 +01:00
parent 64ee9ee2d8
commit c9fceb1c03
4 changed files with 3 additions and 19 deletions

View File

@ -19,7 +19,7 @@ rootpw vagrant
# even on VirtualBox virt, we get a primary network device with "eth0" as the name # 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 # This simplifies things and allows a single disk image for both supported Vagrant
# platforms (virtualbox and kvm) # 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 %packages
# The default koji Vagrantfile configuration uses rsync to sync files between # The default koji Vagrantfile configuration uses rsync to sync files between

View File

@ -119,10 +119,6 @@ passwd -l root
# remove the user anaconda forces us to make # remove the user anaconda forces us to make
userdel -r none 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target rm -f /etc/systemd/system/default.target
@ -240,9 +236,7 @@ rm -f /var/lib/rpm/__db*
echo "Fixing SELinux contexts." echo "Fixing SELinux contexts."
touch /var/log/cron touch /var/log/cron
touch /var/log/boot.log touch /var/log/boot.log
chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore /usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
echo "Zeroing out empty space." echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files # This forces the filesystem to reclaim space from deleted files

View File

@ -23,7 +23,7 @@ user --name=none
firewall --disabled 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 network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final 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 # remove the user anaconda forces us to make
userdel -r none 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target rm -f /etc/systemd/system/default.target
@ -209,9 +205,7 @@ echo "Fixing SELinux contexts."
touch /var/log/cron touch /var/log/cron
touch /var/log/boot.log touch /var/log/boot.log
mkdir -p /var/cache/yum mkdir -p /var/cache/yum
chattr -i /boot/extlinux/ldlinux.sys
/usr/sbin/fixfiles -R -a restore /usr/sbin/fixfiles -R -a restore
chattr +i /boot/extlinux/ldlinux.sys
echo "Zeroing out empty space." echo "Zeroing out empty space."
# This forces the filesystem to reclaim space from deleted files # This forces the filesystem to reclaim space from deleted files

View File

@ -14,7 +14,7 @@ user --name=none
firewall --disabled 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 network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final 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 # remove the user anaconda forces us to make
userdel -r none 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 # setup systemd to boot to the right runlevel
echo -n "Setting default runlevel to multiuser text mode" echo -n "Setting default runlevel to multiuser text mode"
rm -f /etc/systemd/system/default.target rm -f /etc/systemd/system/default.target