Merge pull request #4718 from thaJeztah/remove_sudo_remnants

crosbymichael · web-flow · commit 677aaad83cc4 · 2020-11-10T10:18:13.000-05:00
install-runc: remove unused USESUDO variable
diff --git a/Makefile b/Makefile
@@ -280,7 +280,7 @@ install-cri-deps: $(BINARIES)
 	@install -m 644 containerd.service ${CRIDIR}/etc/systemd/system
 	echo "CONTAINERD_VERSION: '$(VERSION:v%=%)'" | tee ${CRIDIR}/opt/containerd/cluster/version
 
-	DESTDIR=$(CRIDIR) USESUDO=false script/setup/install-runc
+	DESTDIR=$(CRIDIR) script/setup/install-runc
 	DESTDIR=$(CRIDIR) script/setup/install-cni
 	DESTDIR=$(CRIDIR) script/setup/install-critools
 
diff --git a/script/setup/install-runc b/script/setup/install-runc
@@ -27,14 +27,7 @@ function install_runc() {
 	cd "$GOPATH"/src/github.com/opencontainers/runc
 	git checkout $RUNC_COMMIT
 	make BUILDTAGS='apparmor seccomp selinux' runc
-
-	USESUDO=${USESUDO:-false}
-	if ${USESUDO}; then
-	  SUDO='sudo -E'
-	else
-	  SUDO=''
-	fi
-	${SUDO} make install
+	make install
 }
 
 function install_crun() {
