diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-09 17:27:28 +0200 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-09 17:27:28 +0200 |
| commit | 1087207142e3b693cefcc24459e644be86bb0ff4 (patch) | |
| tree | 2cd193dc0d8fc004f23cbc1259bb91a5920c4fc0 /scripts | |
| parent | 5e806c8e42e1b70675916963e14cc0fe5928ec07 (diff) | |
| parent | d9ba657ceb39904efa09cbddc73ab38d517f5c7f (diff) | |
| download | vyatta-cfg-quagga-1087207142e3b693cefcc24459e644be86bb0ff4.tar.gz vyatta-cfg-quagga-1087207142e3b693cefcc24459e644be86bb0ff4.zip | |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index 1bf47dde..c37bf7a8 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -76,7 +76,7 @@ kernel_versions=$(ls $ROOTFSDIR/boot/vmlinuz-* 2> /dev/null | grep -v xen | awk # get xen kernel info xen_kernel_version=$(ls $ROOTFSDIR/boot/vmlinuz*xen 2> /dev/null | awk -F/ '{ print $5 }' | sed 's/vmlinuz//g' | sort -r) -xen_version=$(ls $ROOTFSDIR/boot/xen-* 2> /dev/null | awk -F/ '{ print $5 }' | sort -r) +xen_version=$(ls $ROOTFSDIR/boot/xen-*.gz 2> /dev/null | head -1 | awk -F/ '{ print $5 }' | sort -r) # Figure out whether we are running on the serial or KVM console: if [ "`tty`" == "/dev/ttyS0" ]; then |