diff options
| author |   Michael Sterrett <mr_bones_@gentoo.org> | 2013-04-29 17:33:00 +0000 |
|---|---|---|
| committer | Michael Sterrett <mr_bones_@gentoo.org> | 2013-04-29 17:33:00 +0000 |
| commit | 855211578a5d8d6d268933b480542458b102bcc2 (patch) | |
| tree | 4efd0237ba690f048e1997602949119c698e5873 | |
| parent | depend() shouldn't talk to the user (diff) | |
| download | gentoo-2-855211578a5d8d6d268933b480542458b102bcc2.tar.gz gentoo-2-855211578a5d8d6d268933b480542458b102bcc2.tar.bz2 gentoo-2-855211578a5d8d6d268933b480542458b102bcc2.zip | |
use required_* runscript variables; STATEFILE_DIR typo
(Portage version: 2.1.11.62/cvs/Linux x86_64, unsigned Manifest commit)
| -rw-r--r-- | app-admin/syslog-ng/ChangeLog | 5 | ||||
| -rw-r--r-- | app-admin/syslog-ng/files/3.4/syslog-ng.rc6 | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/app-admin/syslog-ng/ChangeLog b/app-admin/syslog-ng/ChangeLog index ffb11473c0f3..dbe2e3c7f47e 100644 --- a/app-admin/syslog-ng/ChangeLog +++ b/app-admin/syslog-ng/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/syslog-ng # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.332 2013/04/29 17:27:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/ChangeLog,v 1.333 2013/04/29 17:33:00 mr_bones_ Exp $ + + 29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6: + use required_* runscript variables; STATEFILE_DIR typo 29 Apr 2013; Michael Sterrett <mr_bones_@gentoo.org> files/3.4/syslog-ng.rc6: depend() shouldn't talk to the user diff --git a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 index 11c324d62c60..b3b5b2284776 100644 --- a/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 +++ b/app-admin/syslog-ng/files/3.4/syslog-ng.rc6 @@ -1,10 +1,10 @@ #!/sbin/runscript # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.2 2013/04/29 17:27:28 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/files/3.4/syslog-ng.rc6,v 1.3 2013/04/29 17:32:59 mr_bones_ Exp $ SYSLOG_NG_CONFIGFILE=${SYSLOG_NG_CONFIGFILE:-/etc/syslog-ng/${RC_SVCNAME}.conf} -SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/lib/syslog-ng} +SYSLOG_NG_STATEFILE_DIR=${SYSLOG_NG_STATEFILE_DIR:-/var/lib/syslog-ng} SYSLOG_NG_STATEFILE=${SYSLOG_NG_STATEFILE:-${SYSLOG_NG_STATEFILE_DIR}/syslog-ng.persist} SYSLOG_NG_PIDFILE_DIR=${SYSLOG_NG_PIDFILE_DIR:-/var/run} SYSLOG_NG_PIDFILE=${SYSLOG_NG_PIDFILE:-${SYSLOG_NG_PIDFILE_DIR}/${RC_SVCNAME}.pid} @@ -21,6 +21,8 @@ start_stop_daemon_args="--user \"${SYSLOG_NG_USER}\":\"${SYSLOG_NG_GROUP}\"" description="Syslog-ng is a syslog replacement with advanced filtering features." description_checkconfig="Check the configuration file that will be used by \"start\"" description_reload="Reload the configuration without exiting" +required_files="${SYSLOG_NG_CONFIGFILE}" +required_dirs="${SYSLOG_NG_PIDFILE_DIR}" depend() { config "${SYSLOG_NG_CONFIGFILE}" @@ -31,12 +33,6 @@ depend() { } checkconfig() { - if [ ! -e "${SYSLOG_NG_CONFIGFILE}" ] ; then - eerror "You need to create ${SYSLOG_NG_CONFIGFILE} first." - eerror "An example can be found in /usr/share/doc/syslog-ng*" - - return 1 - fi ebegin "Checking your configfile (${SYSLOG_NG_CONFIGFILE})" syslog-ng -s -f "${SYSLOG_NG_CONFIGFILE}" eend $? "Configuration error. Please fix your configfile (${SYSLOG_NG_CONFIGFILE})" |