diff options
| author |   Brandon Low <lostlogic@gentoo.org> | 2003-06-01 05:22:42 +0000 |
|---|---|---|
| committer | Brandon Low <lostlogic@gentoo.org> | 2003-06-01 05:22:42 +0000 |
| commit | 269ef190806ef09f5719545b964d1a971447207f (patch) | |
| tree | ade7746f9351aaf1486695b66fffd30f294caddd /net-dns/bind/files | |
| parent | Add xmbmon to portage (diff) | |
| download | gentoo-2-269ef190806ef09f5719545b964d1a971447207f.tar.gz gentoo-2-269ef190806ef09f5719545b964d1a971447207f.tar.bz2 gentoo-2-269ef190806ef09f5719545b964d1a971447207f.zip | |
Fix rcfile issues
Diffstat (limited to 'net-dns/bind/files')
| -rw-r--r-- | net-dns/bind/files/named.rc6 | 12 | ||||
| -rw-r--r-- | net-dns/bind/files/named.rc7 | 66 |
2 files changed, 6 insertions, 72 deletions
diff --git a/net-dns/bind/files/named.rc6 b/net-dns/bind/files/named.rc6 index 581af764b4cf..d0e39b902f78 100644 --- a/net-dns/bind/files/named.rc6 +++ b/net-dns/bind/files/named.rc6 @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc6,v 1.9 2003/02/14 22:59:13 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc6,v 1.10 2003/06/01 05:22:40 lostlogic Exp $ opts="start stop reload restart" @@ -22,10 +22,10 @@ checkconfig() { fi if [ $CHROOT -a -d $CHROOT ] ; then - PIDFILE="${CHROOT}/var/run/named/named.pid" + PIDFILE="${CHROOT}/var/run/named.pid" KEY="${CHROOT}/etc/bind/rndc.key" else - PIDFILE="/var/run/named/named.pid" + PIDFILE="/var/run/named.pid" KEY="/etc/bind/rndc.key" fi } @@ -52,8 +52,8 @@ reload() { fi if [ -f $KEY ] ; then - ebegin "Reloading named" - rndc -k $KEY reconfig &>/dev/null + ebegin "Reloading named.conf and zone files" + rndc -k $KEY reload &>/dev/null eend $? else /etc/init.d/named restart &>/dev/null fi @@ -63,4 +63,4 @@ restart() { svc_stop svc_start } -
\ No newline at end of file + diff --git a/net-dns/bind/files/named.rc7 b/net-dns/bind/files/named.rc7 deleted file mode 100644 index e2663994978a..000000000000 --- a/net-dns/bind/files/named.rc7 +++ /dev/null @@ -1,66 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/files/named.rc7,v 1.1 2003/04/27 22:37:46 lostlogic Exp $ - -opts="start stop reload restart" - -depend() { - need net - use logger - provide dns -} - -checkconfig() { - if [ ! -f ${CHROOT}/etc/bind/named.conf ] ; then - eerror "No ${CHROOT}/etc/bind/named.conf file exists!" - fi - - # In case someone doesn't have $CPU set from /etc/conf.d/named - if [ ! $CPU ] ; then - CPU=1 - fi - - if [ $CHROOT -a -d $CHROOT ] ; then - PIDFILE="${CHROOT}/var/run/named/named.pid" - KEY="${CHROOT}/etc/bind/rndc.key" - else - PIDFILE="/var/run/named/named.pid" - KEY="/etc/bind/rndc.key" - fi -} - -start() { - ebegin "Starting ${CHROOT:+chrooted }named" - checkconfig || return 1 - start-stop-daemon --start --quiet --exec /usr/sbin/named -- -u named -n $CPU $OPTIONS ${CHROOT:+-t $CHROOT} - eend $? -} - -stop() { - ebegin "Stopping named" - checkconfig || return 2 - start-stop-daemon --stop --quiet --pidfile $PIDFILE - eend $? -} - -reload() { - checkconfig || return 3 - if [ ! -f $PIDFILE ] ; then - /etc/init.d/named start &>/dev/null - exit - fi - - if [ -f $KEY ] ; then - ebegin "Reloading named.conf and zone files" - rndc -k $KEY reload &>/dev/null - eend $? - else /etc/init.d/named restart &>/dev/null - fi -} - -restart() { - svc_stop - svc_start -} - |