Browse Source

Merge pull request #5990 from tripolar/master

don't use unitialised vars when UNBOUND_D_DHCP_LINK != odhcpd
lilik-openwrt-22.03
Hannu Nyman 7 years ago
committed by GitHub
parent
commit
a40234905e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
  1. +1
    -1
      net/unbound/Makefile
  2. +8
    -6
      net/unbound/files/unbound.sh

+ 1
- 1
net/unbound/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=unbound PKG_NAME:=unbound
PKG_VERSION:=1.7.0 PKG_VERSION:=1.7.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
PKG_LICENSE_FILES:=LICENSE PKG_LICENSE_FILES:=LICENSE


+ 8
- 6
net/unbound/files/unbound.sh View File

@ -408,16 +408,18 @@ bundle_private_interface() {
############################################################################## ##############################################################################
unbound_mkdir() { unbound_mkdir() {
local dhcp_origin=$( uci_get dhcp.@odhcpd[0].leasefile )
local dhcp_dir=$( dirname $dhcp_origin )
local filestuff local filestuff
if [ "$UNBOUND_D_DHCP_LINK" = "odhcpd" ] ; then
local dhcp_origin=$( uci_get dhcp.@odhcpd[0].leasefile )
local dhcp_dir=$( dirname $dhcp_origin )
if [ "$UNBOUND_D_DHCP_LINK" = "odhcpd" -a ! -d "$dhcp_dir" ] ; then
# make sure odhcpd has a directory to write (not done itself, yet)
mkdir -p "$dhcp_dir"
fi
if [ ! -d "$dhcp_dir" ] ; then
# make sure odhcpd has a directory to write (not done itself, yet)
mkdir -p "$dhcp_dir"
fi
fi
if [ -f $UNBOUND_KEYFILE ] ; then if [ -f $UNBOUND_KEYFILE ] ; then
filestuff=$( cat $UNBOUND_KEYFILE ) filestuff=$( cat $UNBOUND_KEYFILE )


Loading…
Cancel
Save