From 74616f578d8a7b5882f5f559cf7b6d390a973dd0 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Wed, 25 Dec 2024 00:13:38 -0700 Subject: [PATCH] Improve syncuser conflict help text Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + internal/pkg/container/syncuids.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e7058d8..03fe6191 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -84,6 +84,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Split overlays into distribution and site overlays. #831 - Added note to booting userdoc for removing machine-id. #1609 - Log cpio errors more prominently. #1615 +- Improved syncuser conflict help text. #1614 ### Removed diff --git a/internal/pkg/container/syncuids.go b/internal/pkg/container/syncuids.go index 51d6def9..f2e8f2d5 100644 --- a/internal/pkg/container/syncuids.go +++ b/internal/pkg/container/syncuids.go @@ -113,7 +113,7 @@ func (db syncDB) checkConflicts() error { for nameInHost, hostIds := range db { if hostIds.HostID == containerIds.ContainerID { - 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) + 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 '%s' does not exist on the local host, it cannot be reassigned to a different id number. To resolve the conflict, add '%s' to the local host and re-run syncuser.", containerIds.ContainerID, nameInHost, nameInContainer, nameInContainer, nameInContainer) return errors.New(fmt.Sprintf("id(%v) collision: host(%s) container(%s)", containerIds.ContainerID, nameInHost, nameInContainer)) } }