diff options
| author | Bob Gilligan <gilligan@vyatta.com> | 2011-09-26 15:02:36 -0700 |
|---|---|---|
| committer | Bob Gilligan <gilligan@vyatta.com> | 2011-09-26 15:02:36 -0700 |
| commit | 344e00cb711931536290b1b86e381c8e5b85a7d0 (patch) | |
| tree | 6691361246460cad0827c1e4078ce1b3743617b1 /scripts | |
| parent | 8133013e8c208afbe8fac056d125f0c0c3bfd527 (diff) | |
| download | vyatta-op-344e00cb711931536290b1b86e381c8e5b85a7d0.tar.gz vyatta-op-344e00cb711931536290b1b86e381c8e5b85a7d0.zip | |
Bugfix 7502: Fix "show system image" on xen images built by virt-munger.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index d2eb3fd..68d016f 100755 --- a/scripts/vyatta-boot-image.pl +++ b/scripts/vyatta-boot-image.pl @@ -411,14 +411,11 @@ sub curVer { # Boot command line is not formatted as it would be for a system # booted via grub2 with union mounted root filesystem. Another # possibility is that it the system is Xen booted via pygrub. - # - if (-l $XEN_DEFAULT_IMAGE) { - # On Xen/pygrub systems, we figure out the running version by - # looking at the bind mount of /boot. - $vers = `mount | awk '/on \\/boot / { print \$1 }'`; - $vers =~ s/\/live\/image\/boot\///; - chomp($vers); - } + # On Xen/pygrub systems, we figure out the running version by + # looking at the bind mount of /boot. + $vers = `mount | awk '/on \\/boot / { print \$1 }'`; + $vers =~ s/\/live\/image\/boot\///; + chomp($vers); } # In a non-image system, the kernel resides directly under "/boot". |