diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-08-03 16:09:19 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-08-03 16:09:52 +0200 |
| commit | 462fde2ab4b004905fa83f2f13165627491b0013 (patch) | |
| tree | f372181f81df54d89ea566f40d9a2cbc7ecc3102 /scripts | |
| parent | 10003bcce49604d394a9a8b746748f5dfd334cdd (diff) | |
| download | vyatta-op-462fde2ab4b004905fa83f2f13165627491b0013.tar.gz vyatta-op-462fde2ab4b004905fa83f2f13165627491b0013.zip | |
T2757: remove additional newline from "show system image version"
(cherry picked from commit 81160c16b2b56ab50732dcb7a246284e21aded6f)
Diffstat (limited to 'scripts')
| -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; } } } |