From f3e01de3a358a8cc65b4ce253dd4ccedfa7388fd Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 7 Jul 2020 16:56:56 +0100 Subject: [PATCH 1/3] Install auto-update systemd service and timer. Signed-off-by: Peter Oliver --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 51c2704b7f..dc94d816f0 100644 --- a/Makefile +++ b/Makefile @@ -575,6 +575,8 @@ install.systemd: install.varlink # 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/auto-update/podman-auto-update.service ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.service + install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.timer ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.timer 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 From 4384de9e6bdc1d087bc4de6550760fe991946c34 Mon Sep 17 00:00:00 2001 From: Peter Oliver Date: Tue, 7 Jul 2020 18:02:18 +0100 Subject: [PATCH 2/3] Fix test failure regarding unpackaged files. Signed-off-by: Peter Oliver --- contrib/spec/podman.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index 1795674e3d..c7feed12a2 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -500,6 +500,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/zsh/site-functions/* %{_libexecdir}/%{name}/conmon %config(noreplace) %{_sysconfdir}/cni/net.d/87-%{name}-bridge.conflist +%{_unitdir}/podman-auto-update.service +%{_unitdir}/podman-auto-update.timer %{_unitdir}/podman.service %{_unitdir}/podman.socket %{_usr}/lib/systemd/user/podman.service From efcc2f5b18482d42ad8be9987037322518cf45f6 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Mon, 3 Aug 2020 13:11:36 +0200 Subject: [PATCH 3/3] Install auto-update services for users Signed-off-by: Valentin Rothberg --- Makefile | 5 ++++- contrib/spec/podman.spec.in | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index dc94d816f0..08a3cddac8 100644 --- a/Makefile +++ b/Makefile @@ -572,9 +572,12 @@ endif .PHONY: install.systemd install.systemd: install.varlink install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} - # Install APIV2 services + # User services + install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.service ${DESTDIR}${USERSYSTEMDDIR}/podman-auto-update.service + install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.timer ${DESTDIR}${USERSYSTEMDDIR}/podman-auto-update.timer 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 + # System services install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.service ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.service install ${SELINUXOPT} -m 644 contrib/systemd/auto-update/podman-auto-update.timer ${DESTDIR}${SYSTEMDDIR}/podman-auto-update.timer install ${SELINUXOPT} -m 644 contrib/systemd/system/podman.socket ${DESTDIR}${SYSTEMDDIR}/podman.socket diff --git a/contrib/spec/podman.spec.in b/contrib/spec/podman.spec.in index c7feed12a2..2411eaabcb 100644 --- a/contrib/spec/podman.spec.in +++ b/contrib/spec/podman.spec.in @@ -506,6 +506,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_unitdir}/podman.socket %{_usr}/lib/systemd/user/podman.service %{_usr}/lib/systemd/user/podman.socket +%{_usr}/lib/systemd/user/podman-auto-update.service +%{_usr}/lib/systemd/user/podman-auto-update.timer %if 0%{?with_devel} %files -n libpod-devel -f devel.file-list