- improved "chroot automount" patches (#504596)bind-9_6_1-2_fc11

- host should fail if specified server doesn't respond (#507469)

1 files changed, 4 insertions, 2 deletions

diff --git a/named.init b/named.init
index 517e292..af4f9f1 100755
--- a/named.init
+++ b/named.init
@@ -48,7 +48,8 @@ fi
    /usr/sbin/dnssec-configure -b --norestart --dnssec="$DNSSEC" --dlv="$DLV"
 
 ROOTDIR_MOUNT='/etc/named /etc/pki/dnssec-keys /var/named /etc/named.conf
-/etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key'
+/etc/named.dnssec.keys /etc/named.rfc1912.zones /etc/rndc.conf /etc/rndc.key
+/usr/lib64/bind /usr/lib/bind'
 
 mount_chroot_conf()
 {
@@ -68,8 +69,9 @@ mount_chroot_conf()
       else
         # Mount source is a directory. Mount it only if directory in chroot is
         # empty.
-        [ `ls -1A $ROOTDIR$all | wc -l` -eq 0 ] && \
+	if [ -e "$all" ] && [ `ls -1A $ROOTDIR$all | wc -l` -eq 0 ]; then
           mount --bind "$all" "$ROOTDIR$all"
+	fi
       fi
     done
   fi