From 90167b7ce26670f48a4f22568fbc1f9b4d7e3e72 Mon Sep 17 00:00:00 2001 From: Kahou Lei Date: Wed, 4 Oct 2017 13:58:01 -0700 Subject: [PATCH] Revert "Unpackaged binaries shouldn't go in /usr/bin" This reverts commit 079b2c4baf82348a143f1da67f51d6b81733d002. --- install/k8s/install.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/install/k8s/install.sh b/install/k8s/install.sh index a041391..7b739f7 100755 --- a/install/k8s/install.sh +++ b/install/k8s/install.sh @@ -276,11 +276,9 @@ echo "Applying contiv installation" grep -q -F "netmaster" /etc/hosts || echo "$netmaster netmaster" >>/etc/hosts echo "To customize the installation press Ctrl+C and edit $contiv_yaml." sleep 5 - -# Previous location was in /usr/bin/, so delete it in the case of an upgrade. +chmod +x ./netctl rm -f /usr/bin/netctl -install -m 755 -o root -g root ./netctl /usr/local/bin/netctl - +cp ./netctl /usr/bin/ # Install Contiv $kubectl apply -f $contiv_yaml