diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-03-05 17:19:22 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-04-27 00:28:16 +0200 |
| commit | a866f3b2229ea8f664a0dda753aba7507f087093 (patch) | |
| tree | bc39dcd2d397349e91fd72ede29d232c43719276 | |
| parent | 22e0fa6d314e341b0d43b7f438f2d977fa6a4d31 (diff) | |
| download | vyatta-op-a866f3b2229ea8f664a0dda753aba7507f087093.tar.gz vyatta-op-a866f3b2229ea8f664a0dda753aba7507f087093.zip | |
Bug #156: Check for 'vyatta' or 'vyos' kernels.
| -rwxr-xr-x | scripts/vyatta-show-version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/vyatta-show-version b/scripts/vyatta-show-version index 7ca2124..485e90e 100755 --- a/scripts/vyatta-show-version +++ b/scripts/vyatta-show-version @@ -61,7 +61,7 @@ sub get_image_type { return; } - unless ($kernel =~ /^vmlinuz-.*-([^-]*)-vyatta(.*)$/) { + unless ($kernel =~ /^vmlinuz-.*-([^-]*)-(vyatta|vyos)(.*)$/) { warn "Unknown kernel version: $kernel\n"; return; } @@ -75,7 +75,7 @@ sub get_image_type { $version = $1; } - if ($2 eq '-virt') { + if ($3 eq '-virt') { $version .= " Virtual" } |