summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rwxr-xr-xdocker3
2 files changed, 2 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index cfe923e06..48f35dfd7 100644
--- a/Makefile
+++ b/Makefile
@@ -232,9 +232,7 @@ install.cni:
install.docker: docker-docs
install ${SELINUXOPT} -D -m 755 docker $(BINDIR)/docker
install ${SELINUXOPT} -d -m 755 $(MANDIR)/man1
- install ${SELINUXOPT} -d -m 755 $(MANDIR)/man5
install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(MANDIR)/man1
- install ${SELINUXOPT} -m 644 docs/docker*.5 -t $(MANDIR)/man5
install.systemd:
install ${SELINUXOPT} -m 644 -D contrib/varlink/io.projectatomic.podman.socket ${SYSTEMDDIR}/io.projectatomic.podman.socket
diff --git a/docker b/docker
index c647da8e2..a68a37ab3 100755
--- a/docker
+++ b/docker
@@ -1,3 +1,4 @@
#!/bin/sh
-echo "Using podman package to emulate the Docker CLI"
+[ -f /etc/containers/nodocker ] || \
+echo "Emulate Docker CLI using podman. Create /etc/containers/nodocker to quiet msg." >&2
exec /usr/bin/podman $@