diff options
| author | Cheng Zhang <cheng.zhang@citrix.com> | 2017-03-29 15:20:09 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-29 15:20:09 +0800 |
| commit | 97fe8f36da5c3838bfd74cb85f9b8cc3955f4e69 (patch) | |
| tree | 0f1d0f81ce0218574b2326eca644b0495df9b8b8 | |
| parent | 3a916607ce22059887c307f39345e6f643364f0b (diff) | |
| parent | 116a0c045c0eeb807cb379fb687a142400726ec9 (diff) | |
| download | vyos-xe-guest-utilities-97fe8f36da5c3838bfd74cb85f9b8cc3955f4e69.tar.gz vyos-xe-guest-utilities-97fe8f36da5c3838bfd74cb85f9b8cc3955f4e69.zip | |
Merge pull request #30 from xiewei20082008/private/weix/CA-244770
CA-244770: Use extended regex parameter in sed.
| -rwxr-xr-x | mk/xe-linux-distribution | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/xe-linux-distribution b/mk/xe-linux-distribution index 5ba714a..76fa531 100755 --- a/mk/xe-linux-distribution +++ b/mk/xe-linux-distribution @@ -291,8 +291,8 @@ identify_kylin() return 1 fi - eval $(sed -n -e \ - 's/^NeoKylin Linux Advanced Server release V*\([0-9]*\)\\D*\([0-9]*\).*$/distro=neokylin;major=\1;minor=\2;/gp;' \ + 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}") if [ -z "${major}" -o -z "${distro}" ] ; then |