mirror of
https://github.com/containers/podman.git
synced 2025-07-18 01:57:24 +08:00
d5841ed528
Support a new concept in containers.conf called "modules". A "module" is a containers.conf file located at a specific directory. More than one module can be loaded in the specified order, following existing override semantics. There are three directories to load modules from: - $CONFIG_HOME/containers/containers.conf.modules - /etc/containers/containers.conf.modules - /usr/share/containers/containers.conf.modules With CONFIG_HOME pointing to $HOME/.config or, if set, $XDG_CONFIG_HOME. Absolute paths will be loaded as is, relative paths will be resolved relative to the three directories above allowing for admin configs (/etc/) to override system configs (/usr/share/) and user configs ($CONFIG_HOME) to override admin configs. Pulls in containers/common/pull/1599. Signed-off-by: Valentin Rothberg <vrothberg@redhat.com>
17 lines
225 B
Go
17 lines
225 B
Go
//go:build !windows && !plan9
|
|
// +build !windows,!plan9
|
|
|
|
package sftp
|
|
|
|
import (
|
|
"path"
|
|
)
|
|
|
|
func (s *Server) toLocalPath(p string) string {
|
|
if s.workDir != "" && !path.IsAbs(p) {
|
|
p = path.Join(s.workDir, p)
|
|
}
|
|
|
|
return p
|
|
}
|