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

Merge pull request #16433 from Luap99/systemd-check

Browse Source 
fix incorrect systemd booted check
This commit is contained in:
OpenShift Merge Robot
2022-11-07 14:27:00 -05:00
committed by GitHub
parent 9e04bab722 919678d2f8
commit d60b25fc29
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
} }