diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-10 19:31:14 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 19:31:14 +0100 |
| commit | a83a94b095b298c1e8cbcaf20f0744a5807df1de (patch) | |
| tree | 132e6491ef4e15caa7d7296d2492dbc1f2cb41d8 /pkg | |
| parent | 173f430852e52a1acf69b4d9d18da20893031a79 (diff) | |
| parent | 450361fc640751c2a33210a02ceff0874c9f449b (diff) | |
| download | podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.tar.gz podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.tar.bz2 podman-a83a94b095b298c1e8cbcaf20f0744a5807df1de.zip | |
Merge pull request #5448 from vrothberg/update-systemd
update systemd & dbus dependencies
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/server/server.go | 2 | ||||
| -rw-r--r-- | pkg/cgroups/cgroups.go | 4 | ||||
| -rw-r--r-- | pkg/cgroups/systemd.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pkg/api/server/server.go b/pkg/api/server/server.go index a5922e5d7..a0addb303 100644 --- a/pkg/api/server/server.go +++ b/pkg/api/server/server.go @@ -12,7 +12,7 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/pkg/api/handlers" - "github.com/coreos/go-systemd/activation" + "github.com/coreos/go-systemd/v22/activation" "github.com/gorilla/mux" "github.com/gorilla/schema" "github.com/pkg/errors" diff --git a/pkg/cgroups/cgroups.go b/pkg/cgroups/cgroups.go index 6c5b7978c..d51905f4b 100644 --- a/pkg/cgroups/cgroups.go +++ b/pkg/cgroups/cgroups.go @@ -11,8 +11,8 @@ import ( "strings" "github.com/containers/libpod/pkg/rootless" - systemdDbus "github.com/coreos/go-systemd/dbus" - "github.com/godbus/dbus" + systemdDbus "github.com/coreos/go-systemd/v22/dbus" + "github.com/godbus/dbus/v5" spec "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/pkg/cgroups/systemd.go b/pkg/cgroups/systemd.go index b8e6db156..9bbdca415 100644 --- a/pkg/cgroups/systemd.go +++ b/pkg/cgroups/systemd.go @@ -5,8 +5,8 @@ import ( "path/filepath" "strings" - systemdDbus "github.com/coreos/go-systemd/dbus" - "github.com/godbus/dbus" + systemdDbus "github.com/coreos/go-systemd/v22/dbus" + "github.com/godbus/dbus/v5" ) func systemdCreate(path string, c *systemdDbus.Conn) error { |