summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Balocca <rbalocca@vyatta.com>2008-08-29 11:34:51 -0700
committerRick Balocca <rbalocca@vyatta.com>2008-08-29 11:34:51 -0700
commit106f2b2a3169edfe7a0087efa6e5a474dc36fd9b (patch)
tree759943ba52ea786954c77751ba41e12b1efe390f
parent2a6ed4bed75d086eb805a53b0c296a32b9d8bac9 (diff)
parent0aa22026802ff43c59e4bd4fc4a4846ea18f1572 (diff)
downloadvyatta-cfg-system-106f2b2a3169edfe7a0087efa6e5a474dc36fd9b.tar.gz
vyatta-cfg-system-106f2b2a3169edfe7a0087efa6e5a474dc36fd9b.zip
Merge branch 'hollywood' into islavista
-rwxr-xr-xscripts/grub-setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup
index 1e6751d9..a681a955 100755
--- a/scripts/grub-setup
+++ b/scripts/grub-setup
@@ -119,7 +119,7 @@ vga_logo="vga=785"
if [ -f "/boot/vmlinuz" ]; then
# Set first system boot option. Make KVM the default console in this one.
echo -e "menuentry \"Vyatta OFR (KVM console)\" {"
- echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console"
+ echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vty_console"
echo -e "\tinitrd /boot/initrd.img"
echo -e "}"