From ddd6675902f406ea442e363502c7adfc80cace82 Mon Sep 17 00:00:00 2001 From: Igor Kozhukhov Date: Mon, 11 Jan 2016 17:10:16 +0300 Subject: [PATCH] 537 disable check 'joyent_' in image name for build smartos on another env --- configure | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure b/configure index d8eb7c391..c05a5bd80 100755 --- a/configure +++ b/configure @@ -50,14 +50,8 @@ function check_loc [[ "$(readlink -f "$PWD")" != "$(readlink -f "$conf_arg0_dir")" ]] && \ fatal "configure must be run from inside $conf_arg0_dir" [[ "$(uname -s)" != "SunOS" ]] && fatal "build only works on SunOS" - if [[ "$(uname -v)" =~ "joyent_" ]]; then - [[ "$(zonename)" == "global" ]] && fatal \ + [[ "$(zonename)" == "global" ]] && fatal \ "building in a GZ on SmartOS is not supported" - else - echo "Not on SmartOS, assuming IPS and sudo" - conf_ips=1 - conf_priv="sudo" - fi } function create_projects