@matheusbsbs / matheus-bagliano / commits / 963a653fa6
Fork 0

git-daemon(1): don't assume git-daemon is in /usr/bin

In the example inetd.conf lines in git-daemon(1), it was assumed that `git-daemon` resides in the user's /usr/bin. With this patch, we only assume `git` is in /usr/bin. The stronger assumption fails in the default installation nowadays. Signed-off-by: Jonathan Nieder <jrnieder@uchicago.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jonathan Nieder committed Jun 30, 2008 at 17:15 UTC 963a653fa635c6b07ed399b2fafca2a4d7866a21
1 file changed +5 -5
Documentation/git-daemon.txt
+5 -5
@@ -206,8 +206,8 @@ git-daemon as inetd server::
206 /etc/inetd all on one line:
207 +
208 ------------------------------------------------
209 - git stream tcp nowait nobody /usr/bin/git-daemon
210 - git-daemon --inetd --verbose --export-all
209 + git stream tcp nowait nobody /usr/bin/git
210 + git daemon --inetd --verbose --export-all
211 /pub/foo /pub/bar
212 ------------------------------------------------
213
@@ -219,8 +219,8 @@ git-daemon as inetd server for virtual hosts::
219 `/etc/inetd` all on one line:
220 +
221 ------------------------------------------------
222 - git stream tcp nowait nobody /usr/bin/git-daemon
223 - git-daemon --inetd --verbose --export-all
222 + git stream tcp nowait nobody /usr/bin/git
223 + git daemon --inetd --verbose --export-all
224 --interpolated-path=/pub/%H%D
225 /pub/www.example.org/software
226 /pub/www.example.com/software
@@ -241,7 +241,7 @@ git-daemon as regular daemon for virtual hosts::
241 their IP addresses, start the daemon like this:
242 +
243 ------------------------------------------------
244 - git-daemon --verbose --export-all
244 + git daemon --verbose --export-all
245 --interpolated-path=/pub/%IP/%D
246 /pub/192.168.1.200/software
247 /pub/10.10.220.23/software