diff options
| author | Eric Andersen <andersen@codepoet.org> | 2006-04-14 19:25:54 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2006-04-14 19:25:54 +0000 |
| commit | cb7b678a5e9ad4e452903e11649889e0b97a91ce (patch) | |
| tree | b6f89b66f9fd7a73294ade768546a4d19d588365 /package/bind/bind.sysvinit | |
| parent | 55d713a4ecb8ecdfc929f8cd83e73c1973a56f78 (diff) | |
664: bind package update: akvadrako writes:
This patch consists of:
(1) bind version bump
(2) removing some X-compiling build fixes merged upstream
(3) removing the bind-dlopen patch: not of general enough use
(4) remove the package/bind/bind9 file - it isn't used
(5) Use $(STAGING_DIR)/lib instead of $(STAGING_DIR)/usr/lib
(6) Fix chroot'ed bind handling by init script
Diffstat (limited to 'package/bind/bind.sysvinit')
| -rw-r--r-- | package/bind/bind.sysvinit | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/package/bind/bind.sysvinit b/package/bind/bind.sysvinit index a9babd215..171d3208a 100644 --- a/package/bind/bind.sysvinit +++ b/package/bind/bind.sysvinit @@ -18,10 +18,14 @@ case "$1" in test -z "$CHROOT" || ARGS="$ARGS -t $CHROOT" test -z "$SETUID" || ARGS="$ARGS -u $SETUID" if [ ! -f $CHROOT/etc/rndc.key ]; then - echo -n "Initializing $NAME control key: rndc-confgen" - set +e - touch $CHROOT/etc/rndc.key # handle symlinks - rndc-confgen -a -r /dev/urandom $ARGS || echo "." + echo "Initializing $NAME control key: rndc-confgen" + set +e + + # if rndc.key is a symlink, the target must exist + touch $CHROOT/etc/rndc.key + touch etc/rndc.key + + rndc-confgen -a -r /dev/urandom $ARGS || true set -e fi test -z "$CONF" || ARGS="$ARGS -c $CONF" @@ -37,12 +41,12 @@ case "$1" in echo "." ;; restart) - $0 stop + $0 stop || true sleep 2 - $0 start && exit $? + $0 start ;; reload|force-reload) - rndc reload && exit $? + rndc reload || $0 restart ;; *) echo "Usage: $0 {start|stop|restart|reload|force-reload}" |