Attachment 156867 Details for Bug 237965 – second try

[patch] second try

cyrus-imapd-init.patch (text/plain), 3.33 KB, created by Tomas Janousek on 2007-06-13 12:31:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Janousek

Created: 2007-06-13 12:31:12 UTC

Size: 3.33 KB

patch

obsolete

>Index: cyrus-imapd.init
>===================================================================
>RCS file: /cvs/extras/rpms/cyrus-imapd/devel/cyrus-imapd.init,v
>retrieving revision 1.2
>diff -u -r1.2 cyrus-imapd.init
>--- cyrus-imapd.init	28 Feb 2006 20:04:01 -0000	1.2
>+++ cyrus-imapd.init	13 Jun 2007 12:28:44 -0000
>@@ -7,28 +7,12 @@
> # config: /etc/imapd.conf
> # pidfile: /var/run/cyrus-master.pid
> 
>+# Fedora version, based on:
> # author:	Simon Matter, Invoca Systems <simon.matter@invoca.ch>
>-# version:	2005111100
>-# changed:	add quickstart/stop option to init script to bypass db import/export
>+# version:	2007021000
> 
> # Source function library
>-if [ -f /etc/init.d/functions ]; then
>-  . /etc/init.d/functions
>-elif [ -f /etc/rc.d/init.d/functions ]; then
>-  . /etc/rc.d/init.d/functions
>-else
>-  exit 0
>-fi
>-
>-# Source networking configuration.
>-. /etc/sysconfig/network
>-
>-# Check that networking is up.
>-[ ${NETWORKING} = "no" ] && exit 0
>-
>-# check if the config files are present
>-[ -f /etc/cyrus.conf ] || exit 0
>-[ -f /etc/imapd.conf ] || exit 0
>+. /etc/init.d/functions
>  
> # This is our service name
> BASENAME=$(basename $0)
>@@ -37,14 +21,6 @@
>   BASENAME=$(basename $BASENAME)
> fi
> 
>-# Source service configuration.
>-if [ -f /etc/sysconfig/$BASENAME ]; then
>-  . /etc/sysconfig/$BASENAME
>-else
>-  echo "$BASENAME: configfile /etc/sysconfig/$BASENAME does NOT exist !"
>-  exit 1
>-fi
>-
> # get_config [config default]
> # extracts config option from config file
> get_config() {
>@@ -58,8 +34,6 @@
> # where to find files and directories
> CONFIGDIRECTORY=$(get_config configdirectory /var/lib/imap)
> CYRUSMASTER=/usr/lib/cyrus-imapd/cyrus-master
>-CYRUS_PROC_NAME=$(basename $CYRUSMASTER)
>-ALWAYS_CONVERT=1
> 
> # fallback to su if runuser not available
> if [ -x /sbin/runuser ]; then
>@@ -69,10 +43,32 @@
> fi
> 
> RETVAL=0
>-RETVAL2=1
>+RETVAL2=0
> QUICK=0
> 
>+checks_and_sysconfig() {
>+  # Source networking configuration.
>+  . /etc/sysconfig/network
>+
>+  # Check that networking is up.
>+  [ ${NETWORKING} = "no" ] && exit 1
>+
>+  # check if the config files are present
>+  [ -f /etc/cyrus.conf ] || exit 6
>+  [ -f /etc/imapd.conf ] || exit 6
>+
>+  # Source service configuration.
>+  if [ -f /etc/sysconfig/$BASENAME ]; then
>+    . /etc/sysconfig/$BASENAME
>+  else
>+    echo "$BASENAME: configfile /etc/sysconfig/$BASENAME does NOT exist !"
>+    exit 6
>+  fi
>+}
>+
> start() {
>+  checks_and_sysconfig
>+
>   if [ $(/sbin/pidof -s $CYRUSMASTER) ]; then
>     echo -n $"$BASENAME already running."
>     false
>@@ -93,11 +89,11 @@
>     if [ $RETVAL -eq 0 ]; then
>       echo -n $"Starting $BASENAME: "
>       daemon $CYRUSMASTER -d $CYRUSOPTIONS
>-      RETVAL2=$?
>+      RETVAL=$?
>       echo
>     fi
>   fi
>-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && touch /var/lock/subsys/$BASENAME
>+  [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$BASENAME
>   return $RETVAL
> }
> 
>@@ -120,7 +116,7 @@
>     fi
>   fi
>   echo
>-  [ $RETVAL -eq 0 -a $RETVAL2 -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
>+  [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$BASENAME
>   return $RETVAL
> }
> 
>@@ -174,9 +170,13 @@
>     QUICK=1
>     stop
>     ;;
>+  quickrestart)
>+    QUICK=1
>+    restart
>+    ;;
>   *)
>-    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status|quickstart|quickstop}"
>-    RETVAL=1
>+    echo $"Usage: $BASENAME {start|stop|restart|reload|condrestart|status|quickstart|quickstop|quickrestart}"
>+    RETVAL=3
> esac
> 
> exit $RETVAL

Actions: View | Diff

Attachments on bug 237965: 153597 | 156867