diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-05 16:36:41 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-08-05 16:36:41 +0000 |
| commit | 9537105aa503bef1a6de1807657ea8223f5ce7c6 (patch) | |
| tree | c6465f7364f65493fee5c697158cedd72d00e853 | |
| parent | fe08c6b8586e63e9b441c73da1e9f712849e251e (diff) | |
| parent | bd9e80da61ecf93bc2e4a7ec649d95cfef89d4e2 (diff) | |
| download | vyatta-cfg-system-9537105aa503bef1a6de1807657ea8223f5ce7c6.tar.gz vyatta-cfg-system-9537105aa503bef1a6de1807657ea8223f5ce7c6.zip | |
Merge branch 'islavista' of mohit@git.vyatta.com:/git/vyatta-cfg-system into islavista
| -rwxr-xr-x | scripts/grub-setup | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup index 5607b098..c954e465 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -90,7 +90,6 @@ serial_console="console=tty0 console=ttyS0,9600" # Numbering starts at 0 for the first option. echo -e "set default=$default_console" echo "set timeout=5" - #echo "#set splashimage=(hd0,0)/grub/splash.xpm.gz" # set serial console options echo -e "serial --unit=0 --speed=9600" echo "terminal serial" @@ -110,7 +109,6 @@ 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 $vga_logo $vty_console" echo -e "\tlinux /boot/vmlinuz $GRUB_OPTIONS $vga_logo $vty_console" echo -e "\tinitrd /boot/initrd.img" echo -e "}" |