Browse Source

Changes and improvements for SuSE 8.1.

Nils Ohlmeier 23 năm trước cách đây
mục cha
commit
21a5159f05
2 tập tin đã thay đổi với 52 bổ sung38 xóa
  1. 47 37
      rpm/ser.init.SuSE
  2. 5 1
      rpm/ser.spec.SuSE

+ 47 - 37
rpm/ser.init.SuSE

@@ -1,75 +1,81 @@
 #! /bin/sh
 # Copyright (c) 2002 Frauenhofer Gesellschaft FOKUS, Germany.
+# All rights reserved.
 #
 # Author: Nils Ohlmeier <[email protected]>
 #
 # /etc/init.d/ser
 #
 ### BEGIN INIT INFO
-# Provides: sip
-# Required-Start: $network
-# Required-Stop:  $network
-# Default-Start:  3 5
-# Default-Stop:   0 1 2 6
-# Description:    Start the SIP Express Router.
+# Provides:          sip
+# Required-Start:    $network
+# X-UnitedLinux-Should-Start: $network
+# Required-Stop:     $network
+# X-UnitedLinux-Should-Stop: $network
+# Default-Start:     3 5
+# Default-Stop:      0 1 2 6
+# Short-Description: SIP Express Router
+# Description:       Start SER and provide the routing of SIP requests.
 ### END INIT INFO
 
-# Source SuSE config
-. /etc/rc.config
-
-# Determine the base and follow a runlevel link name.
-base=${0##*/}
-link=${base#*[SK][0-9][0-9]}
 
+# Check for missing binaries (stale symlinks should not happen)
 SER_BIN=/usr/sbin/ser
 test -x $SER_BIN || exit 5
 
+# Check for existence of needed config file and read it
+SER_CONFIG=/etc/ser/ser.cfg
+test -r $SER_CONFIG || exit 6
+#. $FOO_CONFIG
+
 # Shell functions sourced from /etc/rc.status:
 #      rc_check         check and set local and overall rc status
 #      rc_status        check and set local and overall rc status
 #      rc_status -v     ditto but be verbose in local rc status
 #      rc_status -v -r  ditto and clear the local rc status
+#      rc_status -s     display "skipped" and exit with status 3
+#      rc_status -u     display "unused" and exit with status 3
 #      rc_failed        set local and overall rc status to failed
-#      rc_failed <num>  set local and overall rc status to <num><num>
+#      rc_failed <num>  set local and overall rc status to <num>
 #      rc_reset         clear local rc status (overall remains)
 #      rc_exit          exit appropriate to overall rc status
+#      rc_active	checks whether a service is activated by symlinks
+#      rc_splash arg    sets the boot splash screen to arg (if active)
 . /etc/rc.status
 
-# First reset status of this service
+# Reset status of this service
 rc_reset
 
 # Return values acc. to LSB for all commands but status:
-# 0 - success
-# 1 - generic or unspecified error
-# 2 - invalid or excess argument(s)
-# 3 - unimplemented feature (e.g. "reload")
-# 4 - insufficient privilege
-# 5 - program is not installed
-# 6 - program is not configured
-# 7 - program is not running
+# 0	  - success
+# 1       - generic or unspecified error
+# 2       - invalid or excess argument(s)
+# 3       - unimplemented feature (e.g. "reload")
+# 4       - user had insufficient privileges
+# 5       - program is not installed
+# 6       - program is not configured
+# 7       - program is not running
+# 8--199  - reserved (8--99 LSB, 100--149 distrib, 150--199 appl)
 # 
 # Note that starting an already running service, stopping
 # or restarting a not-running service as well as the restart
-# with force-reload (in case signalling is not supported) are
+# with force-reload (in case signaling is not supported) are
 # considered a success.
 
 case "$1" in
     start)
-	echo -n "Starting SIP Express Router"
+	echo -n "Starting SIP Express Router "
 	## Start daemon with startproc(8). If this fails
-	## the echo return value is set appropriate.
-
-	# NOTE: startproc return 0, even if service is 
-	# already running to match LSB spec.
+	## the return value is set appropriately by startproc.
 	startproc $SER_BIN
 
 	# Remember status and be verbose
 	rc_status -v
 	;;
     stop)
-	echo -n "Shutting down SIP Express Router"
+	echo -n "Shutting down SIP Express Router "
 	## Stop daemon with killproc(8) and if this fails
-	## set echo the echo return value.
+	## killproc sets the return value according to LSB.
 
 	killproc -TERM $SER_BIN
 
@@ -90,32 +96,36 @@ case "$1" in
 	## do this on signal 1 (SIGHUP).
 	## If it does not support it, restart.
 
-	echo -n "Reload service SIP Express Router"
+	echo -n "Reload service SIP Express Router "
 	## Otherwise:
 	$0 stop  &&  $0 start
 	rc_status
 	;;
     reload)
 	## Like force-reload, but if daemon does not support
-	## signalling, do nothing (!)
+	## signaling, do nothing (!)
 
 	## Otherwise if it does not support reload:
 	rc_failed 3
 	rc_status -v
 	;;
     status)
-	echo -n "Checking for SIP Express Router: "
+	echo -n "Checking for service SIP Express Router "
 	## Check status with checkproc(8), if process is running
 	## checkproc will return with exit status 0.
 
-	# Status has a slightly different for the status command:
-	# 0 - service running
+	# Return value is slightly different for the status command:
+	# 0 - service up and running
 	# 1 - service dead, but /var/run/  pid  file exists
 	# 2 - service dead, but /var/lock/ lock file exists
-	# 3 - service not running
-
+	# 3 - service not running (unused)
+	# 4 - service status unknown :-(
+	# 5--199 reserved (5--99 LSB, 100--149 distro, 150--199 appl.)
+	
 	# NOTE: checkproc returns LSB compliant status values.
 	checkproc $SER_BIN
+	# NOTE: rc_status knows that we called this init script with
+	# "status" option and adapts its messages accordingly.
 	rc_status -v
 	;;
     *)

+ 5 - 1
rpm/ser.spec.SuSE

@@ -32,7 +32,8 @@ Module, Registrar and User Location.
 %package  mysql
 Summary:  MySQL connectivity for the SIP Express Router.
 Group:    System Environment/Daemons
-Requires: ser
+Requires: ser mysql
+BuildPrereq: mysql-devel
 
 %description mysql
 The ser-mysql package contains MySQL database connectivity that you
@@ -149,6 +150,9 @@ sbin/insserv etc/init.d/
 
 
 %changelog
+* Mon Oct 28 2002 Nils Ohlmeier <[email protected]>
+- Added mysql and mysql-devel to the Req for the ser-mysql rpm.
+
 * Thu Sep 26 2002 Nils Ohlmeier <[email protected]>
 - Added library path to mysql/Makefile to build on SuSE 8.0