JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygserver-config: Add -N option to allow different service name.

Browse Source
This commit is contained in:
Corinna Vinschen
2014-11-06 16:36:42 +00:00
parent dfc361dad4
commit 0f3cacfaa5
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygserver/ChangeLog
View File

@@ -1,3 +1,7 @@
2014-11-06 Florian Friesdorf <flo@chaoflow.net>
* cygserver-config: Add -N option to allow different service name.
2014-08-15 Corinna Vinschen <corinna@vinschen.de> 2014-08-15 Corinna Vinschen <corinna@vinschen.de>
* configure.ac: Convert to new AC_INIT style. * configure.ac: Convert to new AC_INIT style.

17
winsup/cygserver/cygserver-config
View File

@@ -10,6 +10,7 @@ LOCALSTATEDIR=/var
progname=$0 progname=$0
auto_answer="" auto_answer=""
service_name=cygserver
request() request()
{ {
@@ -63,6 +64,11 @@ do
auto_answer=no auto_answer=no
;; ;;
-N | --name )
service_name=$1
shift
;;
*) *)
echo "usage: ${progname} [OPTION]..." echo "usage: ${progname} [OPTION]..."
echo echo
@@ -72,6 +78,7 @@ do
echo " --debug -d Enable shell's debug output." echo " --debug -d Enable shell's debug output."
echo " --yes -y Answer all questions with \"yes\" automatically." echo " --yes -y Answer all questions with \"yes\" automatically."
echo " --no -n Answer all questions with \"no\" automatically." echo " --no -n Answer all questions with \"no\" automatically."
echo " --name -N <name> cygserver windows service name."
echo echo
exit 1 exit 1
;; ;;
@@ -84,10 +91,10 @@ _sys="`uname`"
_nt=`expr "${_sys}" : "CYGWIN_NT"` _nt=`expr "${_sys}" : "CYGWIN_NT"`
# Check for running cygserver processes first. # Check for running cygserver processes first.
if ps -ef | grep -v grep | grep -q cygserver if ps -ef | grep -v grep | grep -q ${service_name}
then then
echo echo
echo "There is a cygserver already running. Nothing to do, apparently." echo "There is a cygserver (${service_name}) already running. Nothing to do, apparently."
echo echo
exit 1 exit 1
fi fi
@@ -164,7 +171,7 @@ fi
if [ ${_nt} -gt 0 ] if [ ${_nt} -gt 0 ]
then then
# But only if it is not already installed # But only if it is not already installed
if ! cygrunsrv -Q cygserver > /dev/null 2>&1 if ! cygrunsrv -Q ${service_name} > /dev/null 2>&1
then then
echo echo
echo echo
@@ -173,7 +180,7 @@ then
echo "Do you want to install cygserver as service?" echo "Do you want to install cygserver as service?"
if request "(Say \"no\" if it's already installed as service)" if request "(Say \"no\" if it's already installed as service)"
then then
if ! cygrunsrv -I cygserver -d "CYGWIN cygserver" -p /usr/sbin/cygserver if ! cygrunsrv -I ${service_name} -d "CYGWIN cygserver" -p /usr/sbin/cygserver
then then
echo echo
echo "Installation of cygserver as service failed. Please check the" echo "Installation of cygserver as service failed. Please check the"
@@ -186,7 +193,7 @@ then
fi fi
echo echo
echo "The service has been installed under LocalSystem account." echo "The service has been installed under LocalSystem account."
echo "To start it, call \`net start cygserver' or \`cygrunsrv -S cygserver'." echo "To start it, call \`net start ${service_name}' or \`cygrunsrv -S ${service_name}'."
fi fi
touch "${LOCALSTATEDIR}/log/cygserver.log" touch "${LOCALSTATEDIR}/log/cygserver.log"
chown 18.544 "${LOCALSTATEDIR}/log/cygserver.log" chown 18.544 "${LOCALSTATEDIR}/log/cygserver.log"