kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Refactor and fix bugs in syncuids

Browse Source 
Closes #840

* SyncUids can now return applicable errors even during showOnly, so
  updated ContainerImport to ignore errors during showOnly.
* Fixed handling of file gids during SyncUids

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2023-05-26 17:23:41 -06:00
committed by Jonathon Anderson
parent 7093d722a5
commit 7b2f278f94
4 changed files with 660 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/pkg/api/container/container.go
View File

@@ -203,11 +203,14 @@ func ContainerImport(cip *wwapiv1.ContainerImportParameter) (containerName strin
return
}
err = container.SyncUids(cip.Name, !cip.SyncUser)
if err != nil && !cip.SyncUser {
SyncUserShowOnly := !cip.SyncUser
err = container.SyncUids(cip.Name, SyncUserShowOnly)
if err != nil {
err = fmt.Errorf("error in user sync, fix error and run 'syncuser' manually: %s", err)
wwlog.Error(err.Error())
return
if cip.SyncUser {
return
}
}
wwlog.Info("Building container: %s", cip.Name)