--- zabbix-agent.init	2010-04-15 14:56:03.000000000 +0400
+++ /etc/init.d/zabbix-agent	2010-04-15 14:53:02.000000000 +0400
@@ -14,6 +14,10 @@
 DIR=/var/run/zabbix-agent
 PID=$DIR/$NAME.pid
 
+if [ -r /etc/default/zabbix-agent ]; then
+  . /etc/default/zabbix-agent
+fi
+
 if test ! -d "$DIR"; then
         mkdir "$DIR"
         chown -R zabbix:zabbix "$DIR"
@@ -26,12 +30,22 @@
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
-  start)
+  force-start)
    	rm -f $PID
 	echo "Starting $DESC: $NAME" >&2
 	start-stop-daemon --oknodo --start --pidfile $PID \
 	 --exec $DAEMON >/dev/null 2>&1
 	;;
+  start)
+	if [ "$START" = "no" ]; then
+	    echo "Starting $DESC: disabled"
+	else
+   	    rm -f $PID
+	    echo "Starting $DESC: $NAME" >&2
+	    start-stop-daemon --oknodo --start --pidfile $PID \
+		--exec $DAEMON >/dev/null 2>&1
+	fi
+	;;
   stop)
 	echo "Stopping $DESC: $NAME"
 	start-stop-daemon --oknodo --stop --exec $DAEMON 

--- zabbix-server-pgsql.zabbix-server.init	2010-04-15 14:56:14.000000000 +0400
+++ /etc/init.d/zabbix-server	2010-04-15 14:48:52.000000000 +0400
@@ -14,6 +14,10 @@
 DIR=/var/run/zabbix-server
 PID=$DIR/$NAME.pid
 
+if [ -r /etc/default/zabbix-server ]; then
+  . /etc/default/zabbix-server
+fi
+
 if test ! -d "$DIR"; then
         mkdir "$DIR"
         chown -R zabbix:zabbix "$DIR"
@@ -26,11 +30,21 @@
 export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
 
 case "$1" in
-  start)
-    rm -f $PID
+  force-start)
+	rm -f $PID
 	echo "Starting $DESC: $NAME"
 	start-stop-daemon --oknodo --start --pidfile $PID \
+	    --exec $DAEMON >/dev/null 2>&1
+	;;
+  start)
+	if [ "$START" = "no" ]; then
+	    echo "Starting $DESC: disabled"
+	else
+	    rm -f $PID
+	    echo "Starting $DESC: $NAME"
+	    start-stop-daemon --oknodo --start --pidfile $PID \
 		--exec $DAEMON >/dev/null 2>&1
+	fi
 	;;
   stop)
 	echo "Stopping $DESC: $NAME"
@@ -44,7 +58,7 @@
 	;;
   *)
 	N=/etc/init.d/$NAME
-	echo "Usage: $N {start|stop|restart|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|force-start}" >&2
 	exit 1
 	;;
 esac

--- /dev/null	2009-08-12 10:37:40.000000000 +0400
+++ /etc/default/zabbix-agent	2010-04-15 14:53:27.000000000 +0400
@@ -0,0 +1,5 @@
+# Variables for Zabbix-Agent
+#
+# Whether you want to start Zabbix-Agent automatically.
+START=no
+

--- /dev/null	2009-08-12 10:37:40.000000000 +0400
+++ /etc/default/zabbix-server	2010-04-15 14:53:27.000000000 +0400
@@ -0,0 +1,5 @@
+# Variables for Zabbix-Server
+#
+# Whether you want to start Zabbix-Server automatically.
+START=no
+