diff options
| author | dougb <dougb@FreeBSD.org> | 2004-09-24 23:49:38 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2004-09-24 23:49:38 +0000 |
| commit | fc1ae4d927fb9c28bfbf93ae9b1f027a96765d36 (patch) | |
| tree | a8fa5ef25dad3048b9adbe359060b8d13b3e0980 /etc/rc.d | |
| parent | 3cd959aedd64d8feca8dfea907c8b7ad6f1c191d (diff) | |
| download | FreeBSD-src-fc1ae4d927fb9c28bfbf93ae9b1f027a96765d36.zip FreeBSD-src-fc1ae4d927fb9c28bfbf93ae9b1f027a96765d36.tar.gz | |
Fix two glitches that appear in the non-chroot case. First, if not
chrooted the pid symlink code should not fire. Also, remove the quotes
around the chroot variable in the rndc-confgen invocation so that if
not chrooted the command will still succeed.
Pointed out by: Sean McNeil <sean@mcneil.com>
Diffstat (limited to 'etc/rc.d')
| -rwxr-xr-x | etc/rc.d/named | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/etc/rc.d/named b/etc/rc.d/named index 60cd168..89ea482 100755 --- a/etc/rc.d/named +++ b/etc/rc.d/named @@ -66,11 +66,13 @@ named_precmd() rc_flags="$rc_flags -t $named_chrootdir" confgen_chroot="-t${named_chrootdir}" checkyesno named_chroot_autoupdate && chroot_autoupdate + else + named_symlink_enable=NO fi # Create an rndc.key file for the user if none exists if [ ! -f "${named_chrootdir}/etc/namedb/rndc.key" ]; then - rndc-confgen -a -b256 "${confgen_chroot}" + rndc-confgen -a -b256 ${confgen_chroot} fi } |
