6 files changed, 4 insertions, 35 deletions
diff --git a/contrib/systemd/system/podman.service b/contrib/systemd/system/podman.service
index eaa2ec437..4a63735a3 100644
--- a/contrib/systemd/system/podman.service
+++ b/contrib/systemd/system/podman.service
@@ -2,15 +2,12 @@
 Description=Podman API Service
 Requires=podman.socket
 After=podman.socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 StartLimitIntervalSec=0
 
 [Service]
-Type=oneshot
-Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
+Type=simple
 ExecStart=/usr/bin/podman system service
-TimeoutStopSec=30
-KillMode=process
 
 [Install]
 WantedBy=multi-user.target
diff --git a/contrib/systemd/system/podman.socket b/contrib/systemd/system/podman.socket
index 8b22e31e4..397058ee4 100644
--- a/contrib/systemd/system/podman.socket
+++ b/contrib/systemd/system/podman.socket
@@ -1,6 +1,6 @@
 [Unit]
 Description=Podman API Socket
-Documentation=man:podman-api(1)
+Documentation=man:podman-system-service(1)
 
 [Socket]
 ListenStream=%t/podman/podman.sock
diff --git a/contrib/systemd/user b/contrib/systemd/user
new file mode 120000
index 000000000..3f3d9896b
--- /dev/null
+++ b/contrib/systemd/user
@@ -0,0 +1 @@
+./system/
+\ No newline at end of file
diff --git a/contrib/systemd/user/podman.service b/contrib/systemd/user/podman.service
deleted file mode 100644
index eaa2ec437..000000000
--- a/contrib/systemd/user/podman.service
+++ /dev/null
@@ -1,17 +0,0 @@
-[Unit]
-Description=Podman API Service
-Requires=podman.socket
-After=podman.socket
-Documentation=man:podman-api(1)
-StartLimitIntervalSec=0
-
-[Service]
-Type=oneshot
-Environment=REGISTRIES_CONFIG_PATH=/etc/containers/registries.conf
-ExecStart=/usr/bin/podman system service
-TimeoutStopSec=30
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
-Also=podman.socket
diff --git a/contrib/systemd/user/podman.socket b/contrib/systemd/user/podman.socket
deleted file mode 100644
index 8b22e31e4..000000000
--- a/contrib/systemd/user/podman.socket
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Podman API Socket
-Documentation=man:podman-api(1)
-
-[Socket]
-ListenStream=%t/podman/podman.sock
-SocketMode=0660
-
-[Install]
-WantedBy=sockets.target
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 987e4779c..577a7562b 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -254,8 +254,6 @@ var _ = Describe("Podman generate kube", func() {
 	})
 
 	It("podman generate with user and reimport kube on pod", func() {
-		// This test fails on ubuntu due to https://github.com/seccomp/containers-golang/pull/27
-		SkipIfNotFedora()
 		podName := "toppod"
 		_, rc, _ := podmanTest.CreatePod(podName)
 		Expect(rc).To(Equal(0))