From e2ecb672db934dc1f395460cbcacf8531a2f38f8 Mon Sep 17 00:00:00 2001 From: galal-hussein Date: Thu, 2 May 2019 21:19:16 +0200 Subject: [PATCH] Use host's mount binary before packaged mount --- cmd/k3s/main.go | 2 +- scripts/download | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/k3s/main.go b/cmd/k3s/main.go index 8353e7c3fa..055bed47f1 100644 --- a/cmd/k3s/main.go +++ b/cmd/k3s/main.go @@ -84,7 +84,7 @@ func stageAndRun(dataDir string, cmd string, args []string) error { return errors.Wrap(err, "extracting data") } - if err := os.Setenv("PATH", filepath.Join(dir, "bin")+":"+os.Getenv("PATH")); err != nil { + if err := os.Setenv("PATH", filepath.Join(dir, "bin")+":"+os.Getenv("PATH")+":"+filepath.Join(dir, "bin/aux")); err != nil { return err } diff --git a/scripts/download b/scripts/download index f1f6a2572e..ac897ae5ac 100755 --- a/scripts/download +++ b/scripts/download @@ -12,6 +12,7 @@ mkdir -p ${CHARTS_DIR} curl --compressed -sfL https://github.com/ibuildthecloud/k3s-root/releases/download/${ROOT_VERSION}/k3s-root-${ARCH}.tar | tar xf - ln -sf pigz bin/unpigz +mkdir -p bin/aux && rm bin/mount && ln -sf ../busybox bin/aux/mount TRAEFIK_FILE=traefik-${TRAEFIK_VERSION}.tgz curl -sfL https://kubernetes-charts.storage.googleapis.com/${TRAEFIK_FILE} -o ${CHARTS_DIR}/${TRAEFIK_FILE}