mirror of
https://github.com/containers/podman.git
synced 2025-06-12 19:14:36 +08:00
Merge pull request #6410 from haircommander/fix-segfault
specgen: fix segfault
This commit is contained in:
@ -72,13 +72,17 @@ func addPrivilegedDevices(g *generate.Generator) error {
|
||||
newMounts = append(newMounts, devMnt)
|
||||
}
|
||||
g.Config.Mounts = append(newMounts, g.Config.Mounts...)
|
||||
g.Config.Linux.Resources.Devices = nil
|
||||
if g.Config.Linux.Resources != nil {
|
||||
g.Config.Linux.Resources.Devices = nil
|
||||
}
|
||||
} else {
|
||||
for _, d := range hostDevices {
|
||||
g.AddDevice(Device(d))
|
||||
}
|
||||
// Add resources device - need to clear the existing one first.
|
||||
g.Config.Linux.Resources.Devices = nil
|
||||
if g.Config.Linux.Resources != nil {
|
||||
g.Config.Linux.Resources.Devices = nil
|
||||
}
|
||||
g.AddLinuxResourcesDevice(true, "", nil, nil, "rwm")
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user