opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 19:42:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18388 from ashley-cui/uid

Browse Source 
Fix clashing subuid
This commit is contained in:
OpenShift Merge Robot
2023-05-01 13:51:54 -04:00
committed by GitHub
parent cd9a95922f d06480d99e
commit a9a3b81ac2
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/machine/ignition.go
View File

@ -95,7 +95,7 @@ func (ign *DynamicIgnition) GenerateIgnitionConfig() error {
ignStorage := Storage{
Directories: getDirs(ign.Name),
Files: getFiles(ign.Name),
Files: getFiles(ign.Name, ign.UID),
Links: getLinks(ign.Name),
}
@ -285,7 +285,7 @@ func getDirs(usrName string) []Directory {
return dirs
}
func getFiles(usrName string) []File {
func getFiles(usrName string, uid int) []File {
files := make([]File, 0)
lingerExample := `[Unit]
@ -307,7 +307,13 @@ machine_enabled=true
delegateConf := `[Service]
Delegate=memory pids cpu io
`
subUID := `%s:100000:1000000`
// Prevent subUID from clashing with actual UID
subUID := 100000
subUIDs := 1000000
if uid >= subUID && uid < (subUID+subUIDs) {
subUID = uid + 1
}
etcSubUID := fmt.Sprintf(`%s:%d:%d`, usrName, subUID, subUIDs)
// Add a fake systemd service to get the user socket rolling
files = append(files, File{
@ -341,7 +347,6 @@ Delegate=memory pids cpu io
Mode: IntToPtr(0744),
},
})
// Set up /etc/subuid and /etc/subgid
for _, sub := range []string{"/etc/subuid", "/etc/subgid"} {
files = append(files, File{
@ -354,7 +359,7 @@ Delegate=memory pids cpu io
FileEmbedded1: FileEmbedded1{
Append: nil,
Contents: Resource{
Source: EncodeDataURLPtr(fmt.Sprintf(subUID, usrName)),
Source: EncodeDataURLPtr(etcSubUID),
},
Mode: IntToPtr(0744),
},