mirror of https://github.com/containers/podman.git
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>
This commit is contained in:
parent
2784cf3ca3
commit
b2bdbf331e
|
|
@ -104,6 +104,9 @@ func before(cmd *cobra.Command, args []string) error {
|
|||
logrus.Errorf(err.Error())
|
||||
os.Exit(1)
|
||||
}
|
||||
if err := setSyslog(); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := setupRootless(cmd, args); err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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")
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue