Merge pull request #1383 from anderbubble/1359-syncuser-guidance

Additional guidance when syncuser conflicts

CHANGELOG.md

@@ -45,6 +45,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Added
 
 - Added option for wwclient port number. #1349
+- Additional helper directions during syncuser conflict. #1359
 
 ### Changed
 

internal/pkg/container/syncuids.go

@@ -113,10 +113,8 @@ func (db syncDB) checkConflicts() error {
 
 		for nameInHost, hostIds := range db {
 			if hostIds.HostID == containerIds.ContainerID {
-				errorMsg := fmt.Sprintf("id(%v) collision: host(%s) container(%s)", containerIds.ContainerID, nameInHost, nameInContainer)
-				wwlog.Warn(errorMsg)
-				wwlog.Warn("add %s to host to resolve conflict", nameInContainer)
-				return errors.New(errorMsg)
+				wwlog.Warn("syncuser cannot determine what name should be assigned to id number %v: on the local host it is assigned to '%s'; but in the container it is assigned to '%s'. Since the container's name doesn't exist on the local host, it cannot be reassigned to a different id number. To resolve the conflict, add the container's name to the local host and re-run syncuser.", containerIds.ContainerID, nameInHost, nameInContainer)
+				return errors.New(fmt.Sprintf("id(%v) collision: host(%s) container(%s)", containerIds.ContainerID, nameInHost, nameInContainer))
 			}
 		}
 	}