commit c90a8409a4f79b8bda932c3ba823a6b74385300c
Author: Matthew Miller <mattdm(a)mattdm.org>
Date: Wed Jun 18 11:16:17 2014 -0400
Revert "use no_timer_check boot option -- see
https://bugzilla.redhat.com/show_bug.cgi?id=1102592#c5"
Dennis says to not to. :)
This reverts commit 604f71d4499c4bcd47cbd79098c167a7e6967716.
fedora-cloud-atomic.ks | 4 ++--
fedora-cloud-base.ks | 4 ++--
fedora-cloud-bigdata.ks | 4 ++--
fedora-cloud-experimental.ks | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/fedora-cloud-atomic.ks b/fedora-cloud-atomic.ks
index f6a366e..47c8a95 100644
--- a/fedora-cloud-atomic.ks
+++ b/fedora-cloud-atomic.ks
@@ -16,7 +16,7 @@ user --name=none
firewall --disabled
-bootloader --timeout=1 --append="no_timer_check console=tty1
console=ttyS0,115200n8" --extlinux
+bootloader --timeout=1 --append="console=tty1 console=ttyS0,115200n8"
--extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on
services
--enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -88,7 +88,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 no_timer_check console=hvc0
LANG=en_US.UTF-8" >> /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 "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
echo
done
diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks
index 1868121..3989f4b 100644
--- a/fedora-cloud-base.ks
+++ b/fedora-cloud-base.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="console=tty1 console=ttyS0,115200n8"
--extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on
services
--enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -95,7 +95,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 no_timer_check console=hvc0
LANG=en_US.UTF-8" >> /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 "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
echo
done
diff --git a/fedora-cloud-bigdata.ks b/fedora-cloud-bigdata.ks
index a9dad98..d3241a2 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="console=tty1 console=ttyS0,115200n8"
--extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on
services
--enabled=network,sshd,rsyslog,cloud-init,cloud-init-local,cloud-config,cloud-final
@@ -95,7 +95,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 no_timer_check console=hvc0
LANG=en_US.UTF-8" >> /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 "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
echo
done
diff --git a/fedora-cloud-experimental.ks b/fedora-cloud-experimental.ks
index a52baba..e9e71d1 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="console=tty1 console=ttyS0,115200n8"
--extlinux
network --bootproto=dhcp --device=eth0 --activate --onboot=on
services --enabled=network,sshd,min-cloud-agent
@@ -87,7 +87,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 no_timer_check console=hvc0
LANG=en_US.UTF-8" >> /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 "\tinitrd /boot/initramfs-$kv.img" >> /boot/grub/grub.conf
echo
done