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

vendor: update c/{common, image, storage} to latest main

Browse Source 
Just to make sure everything still works ahead of monorepo move.

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2025-08-21 18:27:24 +02:00
parent 0615fdecfc
commit e76b08394e
370 changed files with 1274 additions and 28518 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
vendor/github.com/containers/common/pkg/config/modules.go generated vendored
View File

@@ -5,21 +5,9 @@ import (
"path/filepath"
"github.com/containers/storage/pkg/fileutils"
"github.com/containers/storage/pkg/homedir"
"github.com/containers/storage/pkg/unshare"
"github.com/hashicorp/go-multierror"
)
// The subdirectory for looking up containers.conf modules.
const moduleSubdir = "containers/containers.conf.modules"
// Moving the base paths into variables allows for overriding them in units
// tests.
var (
moduleBaseEtc = "/etc/"
moduleBaseUsr = "/usr/share"
)
// LoadedModules returns absolute paths to loaded containers.conf modules.
func (c *Config) LoadedModules() []string {
// Required for conmon's callback to Podman's cleanup.
@@ -29,15 +17,12 @@ func (c *Config) LoadedModules() []string {
// Find the specified modules in the options. Return an error if a specific
// module cannot be located on the host.
func (o *Options) modules() ([]string, error) {
func (o *Options) modules(paths *paths) ([]string, error) {
if len(o.Modules) == 0 {
return nil, nil
}
dirs, err := ModuleDirectories()
if err != nil {
return nil, err
}
dirs := moduleDirectories(paths)
configs := make([]string, 0, len(o.Modules))
for _, path := range o.Modules {
@@ -56,21 +41,22 @@ func (o *Options) modules() ([]string, error) {
// 2) /etc/
// 3) /usr/share
func ModuleDirectories() ([]string, error) { // Public API for shell completions in Podman
modules := []string{
filepath.Join(moduleBaseEtc, moduleSubdir),
filepath.Join(moduleBaseUsr, moduleSubdir),
}
if !unshare.IsRootless() {
return modules, nil
}
// Prepend the user modules dir.
configHome, err := homedir.GetConfigHome()
paths, err := defaultPaths()
if err != nil {
return nil, err
}
return append([]string{filepath.Join(configHome, moduleSubdir)}, modules...), nil
return moduleDirectories(paths), nil
}
func moduleDirectories(paths *paths) []string {
const moduleSuffix = ".modules"
modules := make([]string, 0, 3)
if paths.uid > 0 {
modules = append(modules, paths.home+moduleSuffix)
}
modules = append(modules, paths.etc+moduleSuffix)
modules = append(modules, paths.usr+moduleSuffix)
return modules
}
// Resolve the specified path to a module.