diff options
| author | Cheng Zhang <cheng.zhang@citrix.com> | 2017-07-27 18:00:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 18:00:44 +0800 |
| commit | b3bd51875e894a4454a3888c7c68697f94557df6 (patch) | |
| tree | 5fcce690d7e5687f3d440c56b2dad97163d041d9 | |
| parent | 750ac8acee490d7ffde4fbdaa38abbf82285bd1d (diff) | |
| parent | af18cadcb7346ae81103026327628709bd348ff3 (diff) | |
| download | vyos-xe-guest-utilities-b3bd51875e894a4454a3888c7c68697f94557df6.tar.gz vyos-xe-guest-utilities-b3bd51875e894a4454a3888c7c68697f94557df6.zip | |
Merge pull request #39 from DeliZhangX/feature/new-linux-guest/deliz
| -rwxr-xr-x | mk/xe-linux-distribution | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index dccb7f4..b48c511 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -286,16 +286,17 @@ identify_kylin() local minor # distro + # NeoKylin Linux Security OS V5.0 (Update8) # NeoKylin Linux Advanced Server release 6.5 (Berryllium) # NeoKylin Linux Advanced Server release 7.0 if [ ! -f "${kylin_release}" ] ; then - return 1 + return 1 fi eval $(sed -rn \ - 's/^NeoKylin Linux Advanced Server release V*([0-9]*)[^0-9]*([0-9]*).*$/distro=neokylin;major=\1;minor=\2;/gp;' \ - "${kylin_release}") + 's/^NeoKylin Linux.*([0-9]+)\.([0-9]+).*$/distro=neokylin;major=\1;minor=\2;/gp;' \ + "${kylin_release}") if [ -z "${major}" -o -z "${distro}" ] ; then return 1 |