merge r30317

SVN-Revision: 30318

diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile
index 2ba6d4bc2db4388dc23d078082df019ade2e3d87..931a39c31afec244dc13d71760527b1b61f90138 100644 (file)
--- a/admin/syslog-ng/Makefile
+++ b/admin/syslog-ng/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=syslog-ng
 PKG_VERSION:=1.6.12
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3
 
 PKG_SOURCE_URL:= \

diff --git a/admin/syslog-ng/files/syslog-ng.init b/admin/syslog-ng/files/syslog-ng.init
index a8bad3d98943107ca41102f71cd0c5eac9d7f260..4a2706809f55e7708ebd8910a18fcfc2f3dd864d 100644 (file)
--- a/admin/syslog-ng/files/syslog-ng.init
+++ b/admin/syslog-ng/files/syslog-ng.init
@@ -6,7 +6,7 @@ START=50
 SERVICE_USE_PID=1
 
 start() {
-       [ -f /etc/syslog-ng.conf ] || return 1
+       [ -f /etc/syslog-ng/syslog-ng.conf ] || return 1
        service_start /usr/sbin/syslog-ng
 }