diff options
| author | Daniil Baturin <daniil@baturin.org> | 2014-03-05 17:19:22 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2014-03-05 17:19:22 +0100 |
| commit | fea96ae9cbbdb34c90bf9c77867615c056434f5a (patch) | |
| tree | 0ea95636345eb6ec01a0b8f2bbbb1bdf13ce2c44 | |
| parent | 55059a82de4531fd28e50926896086a072bd9dbe (diff) | |
| download | vyatta-op-fea96ae9cbbdb34c90bf9c77867615c056434f5a.tar.gz vyatta-op-fea96ae9cbbdb34c90bf9c77867615c056434f5a.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 f7a3ee9..94ab424 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; } @@ -74,7 +74,7 @@ sub get_image_type { $version = $1; } - if ($2 eq '-virt') { + if ($3 eq '-virt') { $version .= " Virtual" } |