opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-02 01:09:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: update containers/common

Browse Source 
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2021-12-02 18:32:13 +01:00
parent c70878603a
commit fe1cdab59f
16 changed files with 67 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vendor/github.com/containers/common/pkg/config/systemd.go generated vendored
View File

@ -4,12 +4,12 @@ package config
import (
"io/ioutil"
"path/filepath"
"strings"
"sync"
"github.com/containers/common/pkg/cgroupv2"
"github.com/containers/storage/pkg/unshare"
"github.com/coreos/go-systemd/v22/sdjournal"
)
var (
@ -67,12 +67,20 @@ func useJournald() bool {
if !useSystemd() {
return
}
journal, err := sdjournal.NewJournal()
if err != nil {
return
for _, root := range []string{"/run/log/journal", "/var/log/journal"} {
dirs, err := ioutil.ReadDir(root)
if err != nil {
continue
}
for _, d := range dirs {
if d.IsDir() {
if _, err := ioutil.ReadDir(filepath.Join(root, d.Name())); err == nil {
usesJournald = true
return
}
}
}
}
journal.Close()
usesJournald = true
return
})
return usesJournald