diff options
Diffstat (limited to 'main/dovecot/dovecot.initd')
-rw-r--r-- | main/dovecot/dovecot.initd | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/main/dovecot/dovecot.initd b/main/dovecot/dovecot.initd index 7ce07f61c..8e2075d5a 100644 --- a/main/dovecot/dovecot.initd +++ b/main/dovecot/dovecot.initd @@ -1,12 +1,13 @@ #!/sbin/runscript # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/www/viewcvs.gentoo.org/raw_cvs/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.1 2008/11/03 17:22:59 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/dovecot/files/dovecot.init-r2,v 1.3 2010/05/19 13:26:56 patrick Exp $ -opts="reload" +opts="${opts} reload" depend() { need localmount net + before postfix after bootmisc firewall ldap mysql ntp-client ntpd postgresql \ saslauthd slapd use logger @@ -23,14 +24,14 @@ checkconfig() { eerror "You will need an ${DOVECOT_CONF} first" return 1 fi - DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | sed -ne '/^base_dir/{s#^base_dir:[[:space:]]*\(.*[^/]\)/\?$#\1#;p}') + if [ -x /usr/sbin/dovecot ]; then + DOVECOT_BASEDIR=$(/usr/sbin/dovecot -c ${DOVECOT_CONF} -a | grep '^base_dir = ' | sed 's/^base_dir = //') + else + eerror "dovecot not executable" + return 1 + fi DOVECOT_BASEDIR=${DOVECOT_BASEDIR:-/var/run/dovecot} DOVECOT_PIDFILE=${DOVECOT_BASEDIR}/master.pid - if [ ! -d "${DOVECOT_BASEDIR}" ]; then - ebegin "Creating missing base_dir ${DOVECOT_BASEDIR}" - install -d -o root -g root -m 0755 "${DOVECOT_BASEDIR}" - eend $? - fi } start() { |