summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTing Liu <ting.liu@freescale.com>2015-01-22 10:39:59 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-29 15:36:47 +0000
commita3dbfc82ed6796ce2e198e50c478bc4231ca86ff (patch)
tree407d3774988242385783e90fa2e01f14f0b6bdf3
parentc4c885b838eb9578a18c88e88b1ba071eddc53b1 (diff)
downloadpoky-a3dbfc82ed6796ce2e198e50c478bc4231ca86ff.tar.gz
bind: fix typo chown->chmod
(From OE-Core rev: a6ee74222b43d0bb7fe9ef0072ede78f82a5e446) Signed-off-by: Ting Liu <ting.liu@freescale.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/bind/bind/conf.patch2
-rw-r--r--meta/recipes-connectivity/bind/bind/generate-rndc-key.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bind/bind/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch
index 57dbd4e155..aad345f9fc 100644
--- a/meta/recipes-connectivity/bind/bind/conf.patch
+++ b/meta/recipes-connectivity/bind/bind/conf.patch
@@ -277,7 +277,7 @@ diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d
277+ modprobe capability >/dev/null 2>&1 || true 277+ modprobe capability >/dev/null 2>&1 || true
278+ if [ ! -f /etc/bind/rndc.key ]; then 278+ if [ ! -f /etc/bind/rndc.key ]; then
279+ /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom 279+ /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
280+ chown 0640 /etc/bind/rndc.key 280+ chmod 0640 /etc/bind/rndc.key
281+ fi 281+ fi
282+ if [ -f /var/run/named/named.pid ]; then 282+ if [ -f /var/run/named/named.pid ]; then
283+ ps `cat /var/run/named/named.pid` > /dev/null && exit 1 283+ ps `cat /var/run/named/named.pid` > /dev/null && exit 1
diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
index c2e88bf127..db201270fa 100644
--- a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
+++ b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh
@@ -3,5 +3,5 @@
3if [ ! -s /etc/bind/rndc.key ]; then 3if [ ! -s /etc/bind/rndc.key ]; then
4 echo -n "Generating /etc/bind/rndc.key:" 4 echo -n "Generating /etc/bind/rndc.key:"
5 /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom 5 /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom
6 chown 0640 /etc/bind/rndc.key 6 chmod 0640 /etc/bind/rndc.key
7fi 7fi