diff options
author | Markos Chandras <mchandras@suse.de> | 2018-08-10 13:24:00 +0300 |
---|---|---|
committer | Markos Chandras <mchandras@suse.de> | 2018-08-10 13:29:52 +0300 |
commit | fb1e2a6368f1f8e7e6a999ea714d76f97c38fb22 (patch) | |
tree | 30dcc198bd2c4e32ba54468776a4c0dc93db1fc3 /xci/config/user-vars | |
parent | 633523bdadee2617573cdbafa7d24269da738db8 (diff) |
xci-lib: Allow more openSUSE IDs
Leap 15 is using ID=opensuse-leap and Tumbleweed is using
ID=opensuse-tumbleweed so we should extend the regexp to match
these distributions as well. This allows XCI to support more
openSUSE variants as deployment hosts.
Change-Id: I8bf8e7b15fc00c45807ff92fbc14d7ec79ec4bcb
Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/config/user-vars')
-rwxr-xr-x | xci/config/user-vars | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 1f30ec38..2625de24 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -21,7 +21,7 @@ # export XCI_FLAVOR="ha" #------------------------------------------------------------------------------- export XCI_FLAVOR=${XCI_FLAVOR:-mini} -export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})} +export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; ID=${ID%%-*}; echo ${ID,,})} export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false} #------------------------------------------------------------------------------- |