summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-05-02 15:37:38 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-05-04 17:32:22 -0700
commitb1d5aa579fc24949aae9ccad218e23952f77f321 (patch)
tree986b2f882918868f2df94ca99a89ee58d8a60cb4
parent069d7f0177e7028fc28a380036e43ed8d1b96521 (diff)
downloadvyatta-cfg-system-b1d5aa579fc24949aae9ccad218e23952f77f321.tar.gz
vyatta-cfg-system-b1d5aa579fc24949aae9ccad218e23952f77f321.zip
Update grub config to new syntax
The 'terminal' config statement is replaced by terminal_input and terminal_output.
-rwxr-xr-xscripts/vyatta-grub-setup9
1 files changed, 2 insertions, 7 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup
index 0c83ff4d..8c57ccec 100755
--- a/scripts/vyatta-grub-setup
+++ b/scripts/vyatta-grub-setup
@@ -168,7 +168,7 @@ fi
echo "set timeout=5"
# set serial console options
echo -e "serial --unit=0 --speed=9600"
- echo "terminal serial"
+ echo "terminal_output --append serial"
if [ ${ROOT_PARTITION:0:2} = "md" ]; then
echo ""
@@ -179,12 +179,7 @@ fi
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"
- ## don't set timeout here. causes boot problem on 64-bit
- # echo -e "\t\tset timeout=0"
+ echo -e "\tterminal_input console serial"
echo -e "\tfi"
echo "fi"
echo ""