summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Miller <mattdm@mattdm.org>2014-06-18 11:05:23 -0400
committerMatthew Miller <mattdm@mattdm.org>2014-06-18 11:05:23 -0400
commit132e200873ab90d7912fb7ba4b0f0b6dddb31172 (patch)
tree12a5e2cfece3a898b14c9b85f7ec56c8b31fd470
parentce61f186bb2c5b6ba998c59434fac64a4b3dcb81 (diff)
downloadspin-kickstarts-132e200873ab90d7912fb7ba4b0f0b6dddb31172.tar.gz
spin-kickstarts-132e200873ab90d7912fb7ba4b0f0b6dddb31172.tar.xz
spin-kickstarts-132e200873ab90d7912fb7ba4b0f0b6dddb31172.zip
use no_timer_check boot option -- see https://bugzilla.redhat.com/show_bug.cgi?id=1102592#c5
-rw-r--r--fedora-cloud-base.ks4
1 files changed, 2 insertions, 2 deletions
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 66109af..cb8db39 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.ks
@@ -21,7 +21,7 @@ rootpw --lock --iscrypted locked
firewall --disabled
-bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8" extlinux
+bootloader --timeout=1 --append="no_timer_check console=tty1 console=ttyS0,115200n8" extlinux
network --bootproto=dhcp --device=eth0 --onboot=on
services --enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -90,7 +90,7 @@ echo -e 'default=0\ntimeout=0\n\n' > /boot/grub/grub.conf
for kv in $( ls -1v /boot/vmlinuz* |grep -v rescue |sed s/.*vmlinuz-// ); do
echo "title Fedora ($kv)" >> /boot/grub/grub.conf
echo -e "\troot (hd0)" >> /boot/grub/grub.conf
- echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
+ echo -e "\tkernel /boot/vmlinuz-$kv ro root=$rootuuid no_timer_check console=hvc0 LANG=en_US.UTF-8" >> /boot/grub/grub.conf
echo -e "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
echo
done