Skip to content

K
k3s
Unverified Commit f10b43de authored by Darren Shepherd's avatar Darren Shepherd Committed by GitHub
Browse files
Options

Merge pull request #430 from galal-hussein/fix_mount_problem

Use host's mount binary before packaged busybox binary
parents 95059005 e2ecb672
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
cmd/k3s/main.go
View file @ f10b43de
...@@ -84,7 +84,7 @@ func stageAndRun(dataDir string, cmd string, args []string) error { ...@@ -84,7 +84,7 @@ func stageAndRun(dataDir string, cmd string, args []string) error {
return errors.Wrap(err, "extracting data") 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 return err
} }
......
scripts/download
View file @ f10b43de
...@@ -12,6 +12,7 @@ mkdir -p ${CHARTS_DIR} ...@@ -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 - curl --compressed -sfL https://github.com/ibuildthecloud/k3s-root/releases/download/${ROOT_VERSION}/k3s-root-${ARCH}.tar | tar xf -
ln -sf pigz bin/unpigz ln -sf pigz bin/unpigz
mkdir -p bin/aux && rm bin/mount && ln -sf ../busybox bin/aux/mount
TRAEFIK_FILE=traefik-${TRAEFIK_VERSION}.tgz TRAEFIK_FILE=traefik-${TRAEFIK_VERSION}.tgz
curl -sfL https://kubernetes-charts.storage.googleapis.com/${TRAEFIK_FILE} -o ${CHARTS_DIR}/${TRAEFIK_FILE} curl -sfL https://kubernetes-charts.storage.googleapis.com/${TRAEFIK_FILE} -o ${CHARTS_DIR}/${TRAEFIK_FILE}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment