diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-09-17 17:03:51 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-09-17 17:03:51 -0700 |
| commit | 8181db045b6d1ad0e1fd2293b801256b04fee2d0 (patch) | |
| tree | 487744bc1c29db0f6f7378eb29ff1575798a155b /scripts/grub-setup | |
| parent | 133b72347631663ee595312579dd2991059280cb (diff) | |
| parent | 68f0137faceea8a712fe8d269548acbcb5c34d1e (diff) | |
| download | vyatta-cfg-quagga-8181db045b6d1ad0e1fd2293b801256b04fee2d0.tar.gz vyatta-cfg-quagga-8181db045b6d1ad0e1fd2293b801256b04fee2d0.zip | |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'scripts/grub-setup')
| -rwxr-xr-x | scripts/grub-setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/grub-setup b/scripts/grub-setup index a3ecffdf..70da564e 100755 --- a/scripts/grub-setup +++ b/scripts/grub-setup @@ -146,7 +146,7 @@ vga_logo="vga=785" done fi - if [ -f "$ROOTFSDIR/boot/vmlinuz" ] && [ ! eval $UNION ]; then + if [ -f "$ROOTFSDIR/boot/vmlinuz" ] && ! eval $UNION ; 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" |