From 8ab686f0e08d90f0353648446ae49cd4ba85cdfb Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 20 Mar 2020 06:45:45 -0400
Subject: [PATCH] Add APIV2 service files

Also fix issue in pods_test.go

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 Makefile                       | 9 +++++++++
 contrib/spec/podman.spec.in    | 4 ++++
 pkg/bindings/test/pods_test.go | 5 ++++-
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d0f7d9382e..7e5a564a03 100644
--- a/Makefile
+++ b/Makefile
@@ -527,6 +527,11 @@ install.systemd:
 	# For user units the default.target that's the default is fine.
 	sed -e 's,^WantedBy=.*,WantedBy=default.target,' < contrib/varlink/io.podman.service > ${DESTDIR}${USERSYSTEMDDIR}/io.podman.service
 	install ${SELINUXOPT} -m 644 contrib/varlink/podman.conf ${DESTDIR}${TMPFILESDIR}/podman.conf
+	# Install APIV2 services
+	install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.socket ${DESTDIR}${USERSYSTEMDDIR}/podman.socket
+	install ${SELINUXOPT} -m 644 contrib/systemd/user/podman.service ${DESTDIR}${USERSYSTEMDDIR}/podman.service
+	install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${SYSTEMDDIR}/podman.socket
+	install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.service ${DESTDIR}${SYSTEMDDIR}/podman.service
 
 .PHONY: uninstall
 uninstall:
@@ -545,6 +550,10 @@ uninstall:
 	rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.socket
 	rm -f ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket
 	rm -f ${DESTDIR}${SYSTEMDDIR}/io.podman.service
+	rm -f ${DESTDIR}${SYSTEMDDIR}/podman.service
+	rm -f ${DESTDIR}${SYSTEMDDIR}/podman.socket
+	rm -f ${DESTDIR}${USERSYSTEMDDIR}/podman.socket
+	rm -f ${DESTDIR}${USERSYSTEMDDIR}/podman.service
 
 .PHONY: .gitvalidation
 .gitvalidation: .gopathok
diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in
index 635de0c7ee..817be31b7e 100644
--- a/contrib/spec/podman.spec.in
+++ b/contrib/spec/podman.spec.in
@@ -524,6 +524,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_unitdir}/io.podman.socket
 %{_usr}/lib/systemd/user/io.podman.service
 %{_usr}/lib/systemd/user/io.podman.socket
+%{_unitdir}/podman.service
+%{_unitdir}/podman.socket
+%{_usr}/lib/systemd/user/podman.service
+%{_usr}/lib/systemd/user/podman.socket
 %{_usr}/lib/tmpfiles.d/%{name}.conf
 
 %if 0%{?with_devel}
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index fae1deca42..d7334e0e56 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -79,7 +79,10 @@ var _ = Describe("Podman pods", func() {
 
 	// The test validates the list pod endpoint with passing filters as the params.
 	It("List pods with filters", func() {
-		var newpod2 string = "newpod2"
+		var (
+			newpod2  string = "newpod2"
+			trueFlag        = true
+		)
 		bt.Podcreate(&newpod2)
 		_, err = bt.RunTopContainer(nil, &trueFlag, &newpod)
 		Expect(err).To(BeNil())