summaryrefslogtreecommitdiff
path: root/scripts/install-system
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2008-06-09 15:52:58 -0700
committerBob Gilligan <gilligan@vyatta.com>2008-06-09 15:52:58 -0700
commitd55efddd05900b84c583803980943b7097b80faa (patch)
tree44e60522ef83d0c31b89e2562197587362247797 /scripts/install-system
parent5e4ead28e0d5d6011fb1f7fee2cedaa5d9242fe4 (diff)
downloadvyatta-cfg-system-d55efddd05900b84c583803980943b7097b80faa.tar.gz
vyatta-cfg-system-d55efddd05900b84c583803980943b7097b80faa.zip
Bugfix: 3305
Get grub to allow the user to interrupt the boot and drop into the grub menu via either the serial or KVM console.
Diffstat (limited to 'scripts/install-system')
-rwxr-xr-xscripts/install-system18
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/install-system b/scripts/install-system
index 56f2e433..8f2be62b 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -577,14 +577,24 @@ install_grub () {
echo -e "set default=$DEFAULT_CONSOLE"
echo "set timeout=5"
#echo "#set splashimage=(hd0,0)/grub/splash.xpm.gz"
- echo "hiddenmenu"
# set serial console options
echo -e "serial --unit=0 --speed=9600"
- echo "terminal --timeout=5 console serial"
+ echo "terminal serial"
echo "set root=$root"
+
+ echo ""
+ echo "echo -n Press ESC to enter the Grub menu..."
+ echo "if sleep --verbose --interruptible 5 ; then"
+ echo -e "\tterminal console"
+ echo -e "\techo -n Press the ESC key to enter the Grub menu..."
+ echo -e "\tif sleep --verbose --interruptible 5 ; then"
+ echo -e "\t\tterminal serial"
+ echo -e "\t\tset timeout=0"
+ echo -e "\tfi"
+ echo "fi"
+ echo ""
+
if [ -f "/boot/vmlinuz" ]; then
- echo -e "set default=$DEFAULT_CONSOLE\n\n\n"
-
# Set first system boot option. Make KVM the default console in this one.
echo -e "menuentry \"Vyatta OFR (KVM console)\" {"
echo -en "\tlinux /boot/vmlinuz root=/dev/$ROOT_PARTITION $ISCF console=ttyS0,9600 console=tty0 \n"