diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-10-11 16:19:58 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-11 16:19:58 +0200 |
commit | 495db28c7537cbf05ef8c1416f7bea35e193404e (patch) | |
tree | 2227e396299a059531375296f68bb21a9cbfe04f | |
parent | 43dcc917aed8208ffec99b50e469da03ef34d9e8 (diff) | |
parent | ca29a5b2f9d7b7e8d1548659085fa1fc475722d2 (diff) | |
download | podman-495db28c7537cbf05ef8c1416f7bea35e193404e.tar.gz podman-495db28c7537cbf05ef8c1416f7bea35e193404e.tar.bz2 podman-495db28c7537cbf05ef8c1416f7bea35e193404e.zip |
Merge pull request #4231 from cgwalters/user-unit-wanted
Make user io.podman.service unit WantedBy=default.target
-rw-r--r-- | Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -438,7 +438,10 @@ install.systemd: install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${SYSTEMDDIR}/io.podman.socket install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.socket ${DESTDIR}${USERSYSTEMDDIR}/io.podman.socket install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${DESTDIR}${SYSTEMDDIR}/io.podman.service - install ${SELINUXOPT} -m 644 contrib/varlink/io.podman.service ${DESTDIR}${USERSYSTEMDDIR}/io.podman.service + install ${SELINUXOPT} -d ${DESTDIR}${USERSYSTEMDDIR} + # User units are ordered differently, we can't make the *system* multi-user.target depend on a user unit. + # 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 uninstall: |