From 0705e6bc252b22aef066b9342faec0d7f14af453 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 2 May 2023 11:47:30 -0700 Subject: [PATCH] fix chmod for read only files --- pkg/minikube/command/command_runner.go | 5 +++++ pkg/minikube/command/exec_runner.go | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/minikube/command/command_runner.go b/pkg/minikube/command/command_runner.go index 88b6d5ad3b..8782b8f3d1 100644 --- a/pkg/minikube/command/command_runner.go +++ b/pkg/minikube/command/command_runner.go @@ -209,5 +209,10 @@ func writeFile(dst string, f assets.CopyableFile, perms os.FileMode) error { if n != int64(f.GetLength()) { return fmt.Errorf("%s: expected to write %d bytes, but wrote %d instead", dst, f.GetLength(), n) } + + if err := w.Chmod(os.FileMode(perms)); err != nil { + return errors.Wrap(err, "chmod") + } + return w.Close() } diff --git a/pkg/minikube/command/exec_runner.go b/pkg/minikube/command/exec_runner.go index 1ab1885a83..ac0e8e7d9d 100644 --- a/pkg/minikube/command/exec_runner.go +++ b/pkg/minikube/command/exec_runner.go @@ -166,11 +166,6 @@ func (e *execRunner) Copy(f assets.CopyableFile) error { } defer os.Remove(tmpfile.Name()) - // ... set the file permission ... - if err := tmpfile.Chmod(os.FileMode(perms)); err != nil { - return errors.Wrap(err, "error setting file permissions") - } - if err := writeFile(tmpfile.Name(), f, os.FileMode(perms)); err != nil { return errors.Wrapf(err, "error writing to tempfile %s", tmpfile.Name()) }