diff --git a/hack/preload-images/generate.go b/hack/preload-images/generate.go index e1d6061d8b..88ac902463 100644 --- a/hack/preload-images/generate.go +++ b/hack/preload-images/generate.go @@ -181,7 +181,7 @@ func createImageTarball(tarballFilename, containerRuntime string) error { dirs = append(dirs, "./lib/containers") } - args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cvf", tarballFilename} + args := []string{"exec", profile, "sudo", "tar", "-I", "lz4", "-C", "/var", "-cf", tarballFilename} args = append(args, dirs...) cmd := exec.Command("docker", args...) cmd.Stdout = os.Stdout diff --git a/pkg/drivers/kic/oci/volumes.go b/pkg/drivers/kic/oci/volumes.go index c13cbc536b..5a6ff27d75 100644 --- a/pkg/drivers/kic/oci/volumes.go +++ b/pkg/drivers/kic/oci/volumes.go @@ -90,7 +90,7 @@ func ExtractTarballToVolume(ociBin string, tarballPath, volumeName, imageName st if ociBin == Podman && runtime.GOOS == "linux" { cmdArgs = append(cmdArgs, "--security-opt", "label=disable") } - cmdArgs = append(cmdArgs, "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), imageName, "-I", "lz4", "-xvf", "/preloaded.tar", "-C", "/extractDir") + cmdArgs = append(cmdArgs, "-v", fmt.Sprintf("%s:/preloaded.tar:ro", tarballPath), "-v", fmt.Sprintf("%s:/extractDir", volumeName), imageName, "-I", "lz4", "-xf", "/preloaded.tar", "-C", "/extractDir") cmd := exec.Command(ociBin, cmdArgs...) if _, err := runCmd(cmd); err != nil { return err diff --git a/pkg/minikube/cruntime/containerd.go b/pkg/minikube/cruntime/containerd.go index 4943bc847d..8f269cfa9e 100644 --- a/pkg/minikube/cruntime/containerd.go +++ b/pkg/minikube/cruntime/containerd.go @@ -346,7 +346,7 @@ func (r *Containerd) Preload(cfg config.KubernetesConfig) error { t = time.Now() // extract the tarball to /var in the VM - if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil { + if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil { return errors.Wrapf(err, "extracting tarball: %s", rr.Output()) } klog.Infof("Took %f seconds t extract the tarball", time.Since(t).Seconds()) diff --git a/pkg/minikube/cruntime/crio.go b/pkg/minikube/cruntime/crio.go index bda5cd8af2..6169ad9107 100644 --- a/pkg/minikube/cruntime/crio.go +++ b/pkg/minikube/cruntime/crio.go @@ -264,7 +264,7 @@ func (r *CRIO) Preload(cfg config.KubernetesConfig) error { t = time.Now() // extract the tarball to /var in the VM - if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil { + if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil { return errors.Wrapf(err, "extracting tarball: %s", rr.Output()) } klog.Infof("Took %f seconds t extract the tarball", time.Since(t).Seconds()) diff --git a/pkg/minikube/cruntime/docker.go b/pkg/minikube/cruntime/docker.go index 0f012aa166..d05ac97c59 100644 --- a/pkg/minikube/cruntime/docker.go +++ b/pkg/minikube/cruntime/docker.go @@ -347,7 +347,7 @@ func (r *Docker) Preload(cfg config.KubernetesConfig) error { klog.Infof("Took %f seconds to copy over tarball", time.Since(t).Seconds()) // extract the tarball to /var in the VM - if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xvf", dest)); err != nil { + if rr, err := r.Runner.RunCmd(exec.Command("sudo", "tar", "-I", "lz4", "-C", "/var", "-xf", dest)); err != nil { return errors.Wrapf(err, "extracting tarball: %s", rr.Output()) }