summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--cmd/podman/system/service.go4
2 files changed, 2 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 2ac6f426f..43e248233 100644
--- a/Makefile
+++ b/Makefile
@@ -568,6 +568,7 @@ install.docker: docker-docs
.PHONY: install.varlink
ifneq (,$(findstring varlink,$(BUILDTAGS)))
install.varlink:
+ install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
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
@@ -582,8 +583,7 @@ endif
.PHONY: install.systemd
install.systemd: install.varlink
- install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
- install ${SELINUXOPT} -d ${DESTDIR}${USERSYSTEMDDIR}
+ install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR}
# 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
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index ecd17c251..5301b855e 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -3,7 +3,6 @@
package system
import (
- "fmt"
"net/url"
"os"
"path/filepath"
@@ -97,9 +96,6 @@ func service(cmd *cobra.Command, args []string) error {
return registry.ContainerEngine().VarlinkService(registry.GetContext(), opts)
}
- logrus.Warn("This function is EXPERIMENTAL")
- fmt.Fprintf(os.Stderr, "This function is EXPERIMENTAL.\n")
-
return restService(opts, cmd.Flags(), registry.PodmanConfig())
}