From 931e3078351726cd09c89019e6cc0fcbca6b28cf Mon Sep 17 00:00:00 2001
From: Michael Razuvaev <razuvaev@yandex-team.ru>
Date: Tue, 29 May 2012 13:58:33 +0000
Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=20=E2=96=88=E2=96=88=E2=96=88?=
 =?UTF-8?q?=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88=E2=96=88?=
 =?UTF-8?q?=E2=96=88=20=D0=B8=D0=B7=20reqreq=20=D0=B2=D0=B8=D0=BA=D0=B8?=
 =?UTF-8?q?=D0=BD=D1=83=D0=BB=202=20=D0=B4=D0=B5=D0=BC=D0=BE=D0=BD=D0=B0,?=
 =?UTF-8?q?=20init.d=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=20[#CONV-4914]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tools/init.d/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/init.d/template b/tools/init.d/template
index 6cd369b730b..7c70294eef2 100755
--- a/tools/init.d/template
+++ b/tools/init.d/template
@@ -19,6 +19,7 @@ CRONFILE=/etc/cron.d/@CRONFILE@
 
 CNFFILE=$SYSCONFDIR/config.xml
 CONFFILE=$SYSCONFDIR/config.conf
+CONFMERGEDFILE=$SYSCONFDIR/config-merged.conf
 PIDFILE=$PIDDIR/$PROGRAM.pid
 LOCKFILE=$LOCALSTATEDIR/$PROGRAM
 RETVAL=0
@@ -57,7 +58,13 @@ start()
 		chown -R $USER:$GROUP $PIDDIR
 
 		if [ -f "$CONFFILE" ]; then
-			/usr/local/bin/short2old.sh $CONFFILE > $CNFFILE
+			if [ -x /usr/local/bin/conf-merge.sh ]; then
+				/usr/local/bin/conf-merge.sh $CONFFILE $SYSCONFDIR/conf.d $CONFMERGEDFILE
+				else
+				echo "Warning: there is no /usr/local/bin/conf-merge.sh file" >&2
+				cp $CONFFILE $CONFMERGEDFILE
+			fi
+			/usr/local/bin/short2old.sh $CONFMERGEDFILE > $CNFFILE
 			[ $? -ne 0 ] && echo FAILED && exit 1
 		else
 			echo "Warinig: there is no $CONFFILE file; using $CNFFILE file." >&2