summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Gilligan <gilligan@vyatta.com>2008-08-11 14:24:02 -0700
committerBob Gilligan <gilligan@vyatta.com>2008-08-11 14:24:02 -0700
commit883737f620c6e0e95b1f92d2e24e9375efb20910 (patch)
tree206879be8773dbbf5a3f5d50444cf0294a3cd417
parentdc94c5c8e77817df8908c2b6aad08d70b1e142d3 (diff)
downloadvyatta-cfg-system-883737f620c6e0e95b1f92d2e24e9375efb20910.tar.gz
vyatta-cfg-system-883737f620c6e0e95b1f92d2e24e9375efb20910.zip
Bugfix: 1292
Re-enable the Vyatta logo on boot.
-rwxr-xr-xscripts/grub-setup5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup
index 7baa43fd..1e6751d9 100755
--- a/scripts/grub-setup
+++ b/scripts/grub-setup
@@ -33,7 +33,6 @@ ROOTFSDIR="$3"
[ "$ROOT_PARTITION" ] || exit 1
# Grub options
-GRUB_OPTIONS="$GRUB_OPTIONS quiet"
if [ "$GRUB_OPTIONS" ]
then
GRUB_OPTIONS="$GRUB_OPTIONS quiet"
@@ -60,7 +59,7 @@ serial_console="console=tty0 console=ttyS0,9600"
# 65000 (16bit) | 785 788 791 794
# 16.7 Mill.(24bit)| 786 789 792 795
#
- #vga_logo="vga=785"
+vga_logo="vga=785"
# get list of kernels, except Xen
kernel_versions=$(ls /boot/vmlinuz-* 2> /dev/null | grep -v xen | sed 's:/boot/vmlinuz::g' | sort -r)
@@ -120,7 +119,7 @@ serial_console="console=tty0 console=ttyS0,9600"
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 $vty_console"
+ echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console"
echo -e "\tinitrd /boot/initrd.img"
echo -e "}"