Browse Source

Merge pull request #430 from galal-hussein/fix_mount_problem

Use host's mount binary before packaged busybox binary
pull/437/head
Darren Shepherd 6 years ago committed by GitHub
parent
commit
f10b43de25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      cmd/k3s/main.go
  2. 1
      scripts/download

2
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
}

1
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}

Loading…
Cancel
Save