opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix incorrect systemd booted check

Browse Source 
Check for the directory /run/systemd/system, this is described in
sd_booted(3). Reading /proc/1/comm will fail when /proc is mounted
with the `hidepid=2` option.

[NO NEW TESTS NEEDED]

Fixes #16022

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-11-07 17:57:07 +01:00
parent 9e04bab722
commit 919678d2f8
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/utils.go
View File

@ -113,9 +113,9 @@ var (
// RunsOnSystemd returns whether the system is using systemd // RunsOnSystemd returns whether the system is using systemd
func RunsOnSystemd() bool { func RunsOnSystemd() bool {
runsOnSystemdOnce.Do(func() { runsOnSystemdOnce.Do(func() {
initCommand, err := os.ReadFile("/proc/1/comm") // per sd_booted(3), check for this dir
// On errors, default to systemd fd, err := os.Stat("/run/systemd/system")
runsOnSystemd = err != nil || strings.TrimRight(string(initCommand), "\n") == "systemd" runsOnSystemd = err == nil && fd.IsDir()
}) })
return runsOnSystemd return runsOnSystemd
} }