Merge pull request #259 from kahou82/CNTV-40

Revert "Unpackaged binaries shouldn't go in /usr/bin"
contiv · Oct 4, 2017 · 29eda25 · 29eda25
2 parents f7a2f91 + 90167b7
commit 29eda25
Showing 1 changed file with 2 additions and 4 deletions.
diff --git 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