From 77aec3233519e24bb78f1664104b2a1967c92aa4 Mon Sep 17 00:00:00 2001 From: Rick Balocca Date: Fri, 29 Aug 2008 11:35:54 -0700 Subject: Merge from "hollywood" --- scripts/grub-setup | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/grub-setup b/scripts/grub-setup index a681a955..45d39cd0 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 $vty_console" + echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" @@ -139,7 +139,7 @@ vga_logo="vga=785" echo echo -e "menuentry \"Vyatta Xen linux$xversion dom0\" {" echo -e "\tmultiboot /boot/$xen_version " - echo -e "\tmodule /boot/vmlinuz$xversion $GRUB_OPTIONS $vty_console" + echo -e "\tmodule /boot/vmlinuz$xversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tmodule /boot/initrd.img$xversion" echo -e "}" done @@ -150,7 +150,7 @@ vga_logo="vga=785" for kversion in $kernel_versions; do echo echo -e "menuentry \"Vyatta OFR linux$kversion (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vty_console" + echo -e "\tlinux /boot/vmlinuz$kversion $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img$kversion" echo -e "}" echo @@ -166,7 +166,7 @@ vga_logo="vga=785" echo echo -e "menuentry \"Root password reset to factory (KVM console)\" {" - echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vty_console init=$pass_reset" + echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console init=$pass_reset" echo -e "\tinitrd /boot/initrd.img" echo -e "}" -- cgit v1.2.3