OBS User unknown 2008-10-06 15:51:20 +00:00 committed by Git OBS Bridge
parent 2fde0d3347
commit f519bb994d
3 changed files with 25 additions and 6 deletions

View File

@ -32,11 +32,24 @@
# Description: server for git repositories # Description: server for git repositories
### END INIT INFO ### END INIT INFO
git_daemon=/usr/bin/git-daemon git=/usr/bin/git
test -x $git_daemon || { echo "$git_daemon not installed"; test -x $git|| { echo "GIT not installed";
if [ "$1" = "stop" ]; then exit 0; if [ "$1" = "stop" ]; then exit 0;
else exit 5; fi; } else exit 5; fi; }
if test -x /usr/lib64/git/git-daemon; then
git_daemon=/usr/lib64/git/git-daemon
elif test -x /usr/lib/git/git-daemon; then
git_daemon=/usr/lib/git/git-daemon
else
echo "git-daemon not installed"
if [ "$1" = "stop" ]; then
exit 0
else
exit 5
fi
fi
# Check for existence of needed config file and read it # Check for existence of needed config file and read it
git_daemon_config=/etc/sysconfig/git-daemon git_daemon_config=/etc/sysconfig/git-daemon
test -r $git_daemon_config || { echo "$git_daemon_config not existing"; test -r $git_daemon_config || { echo "$git_daemon_config not existing";
@ -56,7 +69,7 @@ rc_reset
case "$1" in case "$1" in
start) start)
echo -n "Starting git-daemon " echo -n "Starting git-daemon "
/sbin/start_daemon "$git_daemon" \ /sbin/start_daemon $git daemon \
--syslog \ --syslog \
--detach \ --detach \
--reuseaddr \ --reuseaddr \
@ -70,7 +83,7 @@ case "$1" in
;; ;;
stop) stop)
echo -n "Shutting down git-daemon " echo -n "Shutting down git-daemon "
/sbin/killproc -TERM $git_daemon /sbin/killproc -p /var/run/git-daemon.pid $git_daemon -TERM
rc_status -v rc_status -v
;; ;;
try-restart|condrestart) try-restart|condrestart)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Oct 6 15:53:47 CEST 2008 - tiwai@suse.de
- fix git-daemon init script to start (bnc#432610)
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Sep 26 17:17:12 CEST 2008 - schwab@suse.de Fri Sep 26 17:17:12 CEST 2008 - schwab@suse.de

View File

@ -20,7 +20,7 @@
Name: git Name: git
BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto
Version: 1.6.0.2 Version: 1.6.0.2
Release: 2 Release: 3
Summary: Fast, scalable, distributed revision control system Summary: Fast, scalable, distributed revision control system
License: GPL v2 or later License: GPL v2 or later
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
@ -146,7 +146,6 @@ License: GPL v2 or later
Summary: Simple Server for Git Repositories Summary: Simple Server for Git Repositories
Group: Development/Tools/Version Control Group: Development/Tools/Version Control
Requires: git-core = %{version} Requires: git-core = %{version}
Provides: git-core:/usr/bin/git-daemon
PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq PreReq: /usr/sbin/useradd %fillup_prereq %insserv_prereq
%description daemon %description daemon
@ -377,6 +376,8 @@ fi
/etc/bash_completion.d/git.sh /etc/bash_completion.d/git.sh
%changelog %changelog
* Mon Oct 06 2008 tiwai@suse.de
- fix git-daemon init script to start (bnc#432610)
* Fri Sep 26 2008 schwab@suse.de * Fri Sep 26 2008 schwab@suse.de
- Fix manual pages. - Fix manual pages.
* Thu Sep 25 2008 tiwai@suse.de * Thu Sep 25 2008 tiwai@suse.de