From f674a22cc9019a567b59aae082199af1ebdbed17 Mon Sep 17 00:00:00 2001
From: Brad Davidson <brad.davidson@rancher.com>
Date: Fri, 28 Apr 2023 08:35:18 +0000
Subject: [PATCH] Improve error message when CLI wrapper Exec fails

Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
(cherry picked from commit 5348b5e69666bbad85395eec5bff40a8aefd1f76)
---
 cmd/k3s/main.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cmd/k3s/main.go b/cmd/k3s/main.go
index e918f9f7f1..517c65ae08 100644
--- a/cmd/k3s/main.go
+++ b/cmd/k3s/main.go
@@ -206,7 +206,10 @@ func stageAndRun(dataDir, cmd string, args []string) error {
 
 	logrus.Debugf("Running %s %v", cmd, args)
 
-	return syscall.Exec(cmd, args, os.Environ())
+	if err := syscall.Exec(cmd, args, os.Environ()); err != nil {
+		return errors.Wrapf(err, "exec %s failed", cmd)
+	}
+	return nil
 }
 
 // getAssetAndDir returns the name of the bindata asset, along with a directory path