diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-08-26 10:29:00 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2020-08-28 10:11:27 +0200 |
| commit | f32eec6ba64c199077c1f717c1045d721ccb3947 (patch) | |
| tree | 3ab98efa75b093fb3d63d85e8a0aae0558a984ab /pkg/domain | |
| parent | 72c5b35ea5db44ca1c81a688d90f5c3aa8f8262e (diff) | |
| download | podman-f32eec6ba64c199077c1f717c1045d721ccb3947.tar.gz podman-f32eec6ba64c199077c1f717c1045d721ccb3947.tar.bz2 podman-f32eec6ba64c199077c1f717c1045d721ccb3947.zip | |
abi: trim init command
without it the systemd detection fails.
Closes: https://github.com/containers/podman/issues/7441
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/system.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go index 478fac1d5..ff1052d86 100644 --- a/pkg/domain/infra/abi/system.go +++ b/pkg/domain/infra/abi/system.go @@ -8,6 +8,7 @@ import ( "os/exec" "path/filepath" "strconv" + "strings" "github.com/containers/common/pkg/config" "github.com/containers/podman/v2/libpod/define" @@ -73,7 +74,7 @@ func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command) initCommand, err := ioutil.ReadFile("/proc/1/comm") // On errors, default to systemd - runsUnderSystemd := err != nil || string(initCommand) == "systemd" + runsUnderSystemd := err != nil || strings.TrimRight(string(initCommand), "\n") == "systemd" unitName := fmt.Sprintf("podman-%d.scope", os.Getpid()) if runsUnderSystemd || conf.Engine.CgroupManager == config.SystemdCgroupsManager { |