KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

dnsmasq: export tftp root to the procd jail

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48761
This commit is contained in:
Felix Fietkau 2016-02-25 09:24:31 +00:00
parent 5e84051a0f
commit b4a1bd8992
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
package/network/services/dnsmasq/files/dnsmasq.init
View file

@ -220,6 +220,12 @@ dnsmasq() {
xappend "--conf-dir=/tmp/dnsmasq.d" xappend "--conf-dir=/tmp/dnsmasq.d"
echo >> $CONFIGFILE echo >> $CONFIGFILE
config_get_bool enable_tftp "$cfg" enable_tftp 0
[ "$enable_tftp" -gt 0 ] && {
config_get tftp_root "$cfg" tftp_root
append EXTRA_MOUNT $tftp_root
}
} }
dhcp_subscrid_add() { dhcp_subscrid_add() {
@ -555,17 +561,6 @@ start_service() {
config_load dhcp config_load dhcp
procd_open_instance
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq.pid
procd_set_param file $CONFIGFILE
procd_set_param respawn
procd_add_jail dnsmasq ubus log
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom /etc/dnsmasq.conf /tmp/dnsmasq.d /tmp/resolv.conf.auto /etc/hosts /etc/ethers
procd_add_jail_mount_rw /var/run/dnsmasq/ /tmp/dhcp.leases $TIMESTAMPFILE
procd_close_instance
# before we can call xappend # before we can call xappend
mkdir -p /var/run/dnsmasq/ mkdir -p /var/run/dnsmasq/
mkdir -p $(dirname $CONFIGFILE) mkdir -p $(dirname $CONFIGFILE)
@ -643,6 +638,17 @@ start_service() {
for DNS_SERVER in $DNS_SERVERS ; do for DNS_SERVER in $DNS_SERVERS ; do
echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf echo "nameserver $DNS_SERVER" >> /tmp/resolv.conf
done done
procd_open_instance
procd_set_param command $PROG -C $CONFIGFILE -k -x /var/run/dnsmasq/dnsmasq.pid
procd_set_param file $CONFIGFILE
procd_set_param respawn
procd_add_jail dnsmasq ubus log
procd_add_jail_mount $CONFIGFILE $TRUSTANCHORSFILE $HOSTFILE /etc/passwd /etc/group /etc/TZ /dev/null /dev/urandom /etc/dnsmasq.conf /tmp/dnsmasq.d /tmp/resolv.conf.auto /etc/hosts /etc/ethers $EXTRA_MOUNT
procd_add_jail_mount_rw /var/run/dnsmasq/ /tmp/dhcp.leases $TIMESTAMPFILE
procd_close_instance
} }
reload_service() { reload_service() {