From 1edeea7663be317b5085013cd0d23ef8cb8d0ad0 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 10 Nov 2020 12:49:21 +0100 Subject: [PATCH] install-runc: remove unused USESUDO variable This is no longer needed, as the script is already run with sudo. Signed-off-by: Sebastiaan van Stijn --- Makefile | 2 +- script/setup/install-runc | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index d87e5e7d7..248f6d960 100644 --- 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 index d4ea55ac4..f0e2c8b43 100755 --- 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() {