summaryrefslogtreecommitdiff
path: root/pkg/spec
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2019-06-13 15:19:17 -0400
committerMatthew Heon <mheon@redhat.com>2019-06-13 15:19:17 -0400
commitb2bdbf331e509aba6a0d0d4a51adc46ca4cf3109 (patch)
tree5bc53667f07b0e7d898a570e90b15cb5e49f04fc /pkg/spec
parent2784cf3ca3c635b1383823dd9bc47d26274e60e3 (diff)
downloadpodman-b2bdbf331e509aba6a0d0d4a51adc46ca4cf3109.tar.gz
podman-b2bdbf331e509aba6a0d0d4a51adc46ca4cf3109.tar.bz2
podman-b2bdbf331e509aba6a0d0d4a51adc46ca4cf3109.zip
When creating exit command, pass storage options on
We made changes earlier that empty storage options when setting storage driver explicitly. Unfortunately, this breaks rootless cleanup commands, as they lose the fuse-overlayfs mount program path. Fix this by passing along the storage options to the cleanup process. Also, fix --syslog, which was broken a while ago (probably when we broke up main to add main_remote). Fixes #3326 Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'pkg/spec')
-rw-r--r--pkg/spec/createconfig.go4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/spec/createconfig.go b/pkg/spec/createconfig.go
index ed8036a54..a8413d6c7 100644
--- a/pkg/spec/createconfig.go
+++ b/pkg/spec/createconfig.go
@@ -162,6 +162,10 @@ func (c *CreateConfig) createExitCommand(runtime *libpod.Runtime) ([]string, err
if config.StorageConfig.GraphDriverName != "" {
command = append(command, []string{"--storage-driver", config.StorageConfig.GraphDriverName}...)
}
+ for _, opt := range config.StorageConfig.GraphDriverOptions {
+ command = append(command, []string{"--storage-opt", opt}...)
+ }
+
if c.Syslog {
command = append(command, "--syslog", "true")
}