Skip to content

Commit

Permalink
Merge pull request #3835 from cgwalters/minor-reexec-fixes
Browse files Browse the repository at this point in the history
daemon: Two minor fixes for reexec
  • Loading branch information
openshift-merge-robot authored Aug 2, 2023
2 parents 1f27a91 + c978cad commit 94fc035
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ func ReexecuteForTargetRoot(target string) error {
// Otherwise, we assume that there's no suffixing needed. Hopefully
// by RHEL10 the MCD will have fundamentally changed and we won't be doing the
// chroot() thing anymore.
klog.Info("not chrooting for source=rhel-%s target=rhel-%s", sourceMajor, targetMajor)
klog.Infof("not chrooting for source=rhel-%s target=rhel-%s", sourceMajor, targetMajor)
}
} else {
klog.Info("assuming we can use container binary chroot() to host")
Expand All @@ -476,6 +476,7 @@ func ReexecuteForTargetRoot(target string) error {
if err != nil {
return fmt.Errorf("writing %s: %w", targetBin, err)
}
defer f.Cleanup()
if _, err := io.Copy(f, src); err != nil {
f.Close()
return fmt.Errorf("writing %s: %w", targetBin, err)
Expand Down

0 comments on commit 94fc035

Please sign in to comment.