Change grub timeout to 15 seconds instead of 150

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1312 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index 8e08747e0b93bcef79b120f8e6c67d9e8419172c..6d1891ef5a4ebe33ae0fbdcb387947d6cc71aaba 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
+  targets/support/bootloader-setup.sh:
+  Change grub timeout to 15 seconds instead of 150
+
   20 Feb 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/pre-kmerge.sh:
   Comment out sed on genkernel executable as it appears to do nothing these days

diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index c938dfa52d1a9316e5dc52dfb10f0e1ed185fe2e..bf66443085232dbaecc9918b9e56337673374951 100755 (executable)
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -345,7 +345,7 @@ case ${clst_hostarch} in
                        icfg=$1/isolinux/isolinux.cfg
                        kmsg=$1/isolinux/kernels.msg
                        echo "default ${first}" > ${icfg}
-                       echo "timeout 150" >> ${icfg}
+                       echo "timeout 15" >> ${icfg}
                        echo "prompt 1" >> ${icfg}
                        echo "display boot.msg" >> ${icfg}
                        echo "F1 kernels.msg" >> ${icfg}