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

Merge pull request #12767 from riyad/fix-storage-opt-double-decode

Browse Source 
Prevent double decoding of storage options
This commit is contained in:
OpenShift Merge Robot
2022-01-07 16:16:59 +01:00
committed by GitHub
parent 7dd7b983b6 7dada6d492
commit 0464011a8e
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libpod/container_internal.go
View File

@ -447,17 +447,8 @@ func (c *Container) setupStorage(ctx context.Context) error {
LabelOpts: c.config.LabelOpts, LabelOpts: c.config.LabelOpts,
} }
nopts := len(c.config.StorageOpts) options.StorageOpt = c.config.StorageOpts
if nopts > 0 {
options.StorageOpt = make(map[string]string, nopts)
for _, opt := range c.config.StorageOpts {
split2 := strings.SplitN(opt, "=", 2)
if len(split2) > 2 {
return errors.Wrapf(define.ErrInvalidArg, "invalid storage options %q for %s", opt, c.ID())
}
options.StorageOpt[split2[0]] = split2[1]
}
}
if c.restoreFromCheckpoint && c.config.ProcessLabel != "" && c.config.MountLabel != "" { if c.restoreFromCheckpoint && c.config.ProcessLabel != "" && c.config.MountLabel != "" {
// If restoring from a checkpoint, the root file-system needs // If restoring from a checkpoint, the root file-system needs
// to be mounted with the same SELinux labels as it was mounted // to be mounted with the same SELinux labels as it was mounted