From ae1f781252e07371f7d650219f6f247e40467182 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Javier=20B=C3=A9rtoli?= Date: Fri, 23 Jul 2021 15:02:45 -0300 Subject: [PATCH] 17535: Modify provision script to run on Centos MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Javier Bértoli --- tools/salt-install/provision.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index 76d8273af6..02b2ae7c60 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -232,22 +232,23 @@ if [ "${DUMP_CONFIG}" = "yes" ]; then else # Install a few dependency packages # First, let's figure out the OS we're working on - OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d= |cut -f 2 -d \") + OS_ID=$(grep ^ID= /etc/os-release |cut -f 2 -d \") echo "Detected distro: ${OS_ID}" case ${OS_ID} in - "centos") - echo "WARNING! Disabling SELinux, see https://dev.arvados.org/issues/18019" - sed -i 's/SELINUX=enforcing/SELINUX=permissive' /etc/sysconfig/selinux - setenforce permissive - yum install -y curl git jq + centos) + PREINSTALL_CMD="/bin/true" + INSTALL_CMD="yum install -y" ;; - "debian"|"ubuntu") - DEBIAN_FRONTEND=noninteractive apt update - DEBIAN_FRONTEND=noninteractive apt install -y curl git jq + debian|ubuntu) + PREINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt update" + INSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt install -y" ;; esac + ${PREINSTALL_CMD} + ${INSTALL_CMD} curl git jq + if which salt-call; then echo "Salt already installed" else -- 2.30.2