[packages/zoneminder.git] / zoneminder-init.patch

--- ZoneMinder-1.24.4/scripts/zm.in.org	2011-07-11 19:20:38.227640562 +0200
+++ ZoneMinder-1.24.4/scripts/zm.in	2011-07-11 19:26:14.075758621 +0200
@@ -45,24 +45,20 @@
 	[ ! -d $ZM_PATH_SOCK ] \
 		&& mkdir -m 774 $ZM_PATH_SOCK \
 		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
-	echo -n $"Starting $prog: "
-	$command start
+	msg_starting "zoneminder"
+	daemon $command start
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && touch $LOCKFILE
+	[ $RETVAL -eq 0 ] && touch $LOCKFILE
 	return $RETVAL
 }
 
 stop()
 {
 	loadconf
-	echo -n $"Stopping $prog: "
-	$command stop
+	msg_stopping "zoneminder"
+	daemon $command stop
 	RETVAL=$?
-	[ $RETVAL = 0 ] && success || failure
-	echo
-	[ $RETVAL = 0 ] && rm -f $LOCKFILE
+	rm -f $LOCKFILE
 }
 
 zmstatus()
Commit	Line	Data
6786dc50 AM	1	--- ZoneMinder-1.24.4/scripts/zm.in.org 2011-07-11 19:20:38.227640562 +0200
	2	+++ ZoneMinder-1.24.4/scripts/zm.in 2011-07-11 19:26:14.075758621 +0200
	3	@@ -45,24 +45,20 @@
	4	[ ! -d $ZM_PATH_SOCK ] \
	5	&& mkdir -m 774 $ZM_PATH_SOCK \
	6	&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $ZM_PATH_SOCK
	7	- echo -n $"Starting $prog: "
	8	- $command start
	9	+ msg_starting "zoneminder"
	10	+ daemon $command start
	11	RETVAL=$?
	12	- [ $RETVAL = 0 ] && success \|\| failure
	13	- echo
	14	- [ $RETVAL = 0 ] && touch $LOCKFILE
	15	+ [ $RETVAL -eq 0 ] && touch $LOCKFILE
	16	return $RETVAL
	17	}
	18
	19	stop()
	20	{
	21	loadconf
	22	- echo -n $"Stopping $prog: "
	23	- $command stop
	24	+ msg_stopping "zoneminder"
	25	+ daemon $command stop
	26	RETVAL=$?
	27	- [ $RETVAL = 0 ] && success \|\| failure
	28	- echo
	29	- [ $RETVAL = 0 ] && rm -f $LOCKFILE
	30	+ rm -f $LOCKFILE
	31	}
	32
	33	zmstatus()