diff options
| author | Daniil Baturin <daniil@vyos.io> | 2020-09-08 00:37:55 +0300 |
|---|---|---|
| committer | Daniil Baturin <daniil@vyos.io> | 2020-09-08 00:37:55 +0300 |
| commit | 9f27802e9f634532d2924f3c0739c50938c79a5d (patch) | |
| tree | ea2c8e03f1ad1ac4dfde2b9bf64f9c3109cf5eac | |
| parent | c29169e5a1bbdf2220278534f046132f1bfe8faa (diff) | |
| parent | 462fde2ab4b004905fa83f2f13165627491b0013 (diff) | |
| download | vyatta-op-9f27802e9f634532d2924f3c0739c50938c79a5d.tar.gz vyatta-op-9f27802e9f634532d2924f3c0739c50938c79a5d.zip | |
Merge branch 'crux' of https://github.com/vyos/vyatta-op into crux
| -rwxr-xr-x | scripts/vyatta-boot-image.pl | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/scripts/vyatta-boot-image.pl b/scripts/vyatta-boot-image.pl index 5057d3a..568fbc0 100755 --- a/scripts/vyatta-boot-image.pl +++ b/scripts/vyatta-boot-image.pl @@ -273,22 +273,23 @@ sub displayBootList { my $m = ''; if (defined $show_version) { - my $vyatta_vers = image_vyatta_version($ver); - $m .= " [$vyatta_vers]"; + my $vyatta_vers = image_vyatta_version($ver); + chomp $vyatta_vers; + $m .= " [$vyatta_vers]"; } if ($didx == $ {$entries}[$i]->{'idx'}) { $m .= ' (default boot)'; } - + if ($ {$entries}[$i]->{'running_vers'} == 1) { - $m .= ' (running image)'; + $m .= ' (running image)'; } if (defined($brief)) { - print "$ver\n"; + print "$ver\n"; } else { - printf " %2d: %s%s\n", $di, $ver, $m; + printf " %2d: %s%s\n", $di, $ver, $m; } } } |