From a866f3b2229ea8f664a0dda753aba7507f087093 Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 5 Mar 2014 17:19:22 +0100 Subject: Bug #156: Check for 'vyatta' or 'vyos' kernels. --- scripts/vyatta-show-version | 4 ++-- 1 file 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" } -- cgit v1.2.3