diff options
| author | Yi Zhao <yi.zhao@windriver.com> | 2021-10-30 23:15:05 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-11-01 10:41:18 +0000 |
| commit | 05bd39df1cfba2e69d5cc441c0ba001d0fe7c0db (patch) | |
| tree | 60e98c7661d66ebe8cb65cf8816c91b6241fbb3a /meta/recipes-connectivity/bind | |
| parent | 1694bb6f698bb206e7c0cce466688faddd7c62ec (diff) | |
| download | poky-05bd39df1cfba2e69d5cc441c0ba001d0fe7c0db.tar.gz | |
bind: remove -r option from rndc-confgen in initscript
The -r option has been removed from rndc-confgen since bind 9.13[1].
Fix the bind startup error:
$ /etc/init.d/bind start
Starting domain name service: namedrndc-confgen: The -r option has been deprecated.
chmod: cannot access '/etc/bind/rndc.key': No such file or directory
[1]: https://gitlab.isc.org/isc-projects/bind9/-/commit/3a4f820d625c214cfb21f5e6d18ce9160d2a193b
(From OE-Core rev: a5c5977bef44b7b014af590515ea1f93d7d51f46)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/bind')
| -rw-r--r-- | meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch | 2 | ||||
| -rw-r--r-- | meta/recipes-connectivity/bind/bind-9.16.21/conf.patch | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch b/meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch index 8db96ec049..ec1bc7b567 100644 --- a/meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch +++ b/meta/recipes-connectivity/bind/bind-9.16.21/0001-avoid-start-failure-with-bind-user.patch | |||
| @@ -17,7 +17,7 @@ index b2eec60..6e03936 100644 | |||
| 17 | @@ -57,6 +57,7 @@ case "$1" in | 17 | @@ -57,6 +57,7 @@ case "$1" in |
| 18 | modprobe capability >/dev/null 2>&1 || true | 18 | modprobe capability >/dev/null 2>&1 || true |
| 19 | if [ ! -f /etc/bind/rndc.key ]; then | 19 | if [ ! -f /etc/bind/rndc.key ]; then |
| 20 | /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom | 20 | /usr/sbin/rndc-confgen -a -b 512 |
| 21 | + chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true | 21 | + chown root:bind /etc/bind/rndc.key >/dev/null 2>&1 || true |
| 22 | chmod 0640 /etc/bind/rndc.key | 22 | chmod 0640 /etc/bind/rndc.key |
| 23 | fi | 23 | fi |
diff --git a/meta/recipes-connectivity/bind/bind-9.16.21/conf.patch b/meta/recipes-connectivity/bind/bind-9.16.21/conf.patch index aad345f9fc..aa3642acec 100644 --- a/meta/recipes-connectivity/bind/bind-9.16.21/conf.patch +++ b/meta/recipes-connectivity/bind/bind-9.16.21/conf.patch | |||
| @@ -276,7 +276,7 @@ diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d | |||
| 276 | + | 276 | + |
| 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 |
| 280 | + chmod 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 |