From f2092b2854edaefe787b53d16aec7ad7a8c09b82 Mon Sep 17 00:00:00 2001
From: Jonathon Anderson <janderson@ciq.com>
Date: Tue, 11 Feb 2025 17:13:06 -0700
Subject: [PATCH] Remove syncuser warning messages in wwctl that assume its use

- #1321

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
---
 CHANGELOG.md                          |  1 +
 internal/app/wwctl/image/exec/main.go | 17 +++++++----------
 internal/pkg/api/image/image.go       |  2 +-
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fab2c42c..537a78e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -35,6 +35,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Removed partial support for regex searches in node and profile lists. #1635
 - Remove redundant `wwctl genconfig completions` command. #1716
+- Remove syncuser warning messages in `wwctl` that assume its use. #1321
 
 ## v4.6.0rc2, 2025-02-07
 
diff --git a/internal/app/wwctl/image/exec/main.go b/internal/app/wwctl/image/exec/main.go
index 8f06af48..d60a671b 100644
--- a/internal/app/wwctl/image/exec/main.go
+++ b/internal/app/wwctl/image/exec/main.go
@@ -130,9 +130,6 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		afterPasswdTime := getTime(path.Join(imagePath, "/etc/passwd"))
 		wwlog.Debug("passwdTime: %v", afterPasswdTime)
 		if beforePasswdTime.Before(afterPasswdTime) {
-			if !SyncUser {
-				wwlog.Warn("/etc/passwd has been modified, maybe you want to run syncuser")
-			}
 			userdbChanged = true
 		}
 	}
@@ -140,16 +137,16 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
 		afterGroupTime := getTime(path.Join(imagePath, "/etc/group"))
 		wwlog.Debug("groupTime: %v", afterGroupTime)
 		if beforeGroupTime.Before(afterGroupTime) {
-			if !SyncUser {
-				wwlog.Warn("/etc/group has been modified, maybe you want to run syncuser")
-			}
 			userdbChanged = true
 		}
 	}
-	if userdbChanged && SyncUser {
-		err = image.SyncUids(imageName, false)
-		if err != nil {
-			wwlog.Error("Error in user sync, fix error and run 'syncuser' manually: %s", err)
+	if SyncUser {
+		if userdbChanged {
+			if err = image.SyncUids(imageName, false); err != nil {
+				wwlog.Error("syncuser error: %s", err)
+			}
+		} else {
+			wwlog.Info("Skipping syncuser (passwd or group not changed)")
 		}
 	}
 
diff --git a/internal/pkg/api/image/image.go b/internal/pkg/api/image/image.go
index d9c2380b..22de5fda 100644
--- a/internal/pkg/api/image/image.go
+++ b/internal/pkg/api/image/image.go
@@ -195,7 +195,7 @@ func ImageImport(cip *wwapiv1.ImageImportParameter) (imageName string, err error
 	if cip.SyncUser {
 		err = image.SyncUids(cip.Name, true)
 		if err != nil {
-			err = fmt.Errorf("error in user sync, fix error and run 'syncuser' manually: %s", err)
+			err = fmt.Errorf("syncuser error: %w", err)
 			return
 		}
 	}