aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/services/odhcpd/files
diff options
context:
space:
mode:
authorSteven Barth <steven@midlink.org>2014-01-17 13:59:51 +0000
committerSteven Barth <steven@midlink.org>2014-01-17 13:59:51 +0000
commit259bddfde7d4e91cd705a0e2b37f584c006908bf (patch)
treefcec9b1e2c6fbbad3da947f3f82172cdc3277046 /package/network/services/odhcpd/files
parent6e39ca25a897f1ad568c292c19dc7edf6d3dd7ad (diff)
downloadupstream-259bddfde7d4e91cd705a0e2b37f584c006908bf.tar.gz
upstream-259bddfde7d4e91cd705a0e2b37f584c006908bf.tar.bz2
upstream-259bddfde7d4e91cd705a0e2b37f584c006908bf.zip
odhcpd: several bugfixes and improved integration
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39308 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/services/odhcpd/files')
-rwxr-xr-xpackage/network/services/odhcpd/files/odhcpd-update4
-rw-r--r--package/network/services/odhcpd/files/odhcpd.defaults19
2 files changed, 22 insertions, 1 deletions
diff --git a/package/network/services/odhcpd/files/odhcpd-update b/package/network/services/odhcpd/files/odhcpd-update
index 20980f2228..e17cd0bfff 100755
--- a/package/network/services/odhcpd/files/odhcpd-update
+++ b/package/network/services/odhcpd/files/odhcpd-update
@@ -1,3 +1,5 @@
#!/bin/sh
# Make dnsmasq reread hostfile
-killall -SIGHUP dnsmasq
+
+pid=$(pidof dnsmasq)
+[ "$(readlink /proc/$pid/exe)" = "/usr/sbin/dnsmasq" ] && kill -SIGHUP $pid
diff --git a/package/network/services/odhcpd/files/odhcpd.defaults b/package/network/services/odhcpd/files/odhcpd.defaults
new file mode 100644
index 0000000000..4d360454a9
--- /dev/null
+++ b/package/network/services/odhcpd/files/odhcpd.defaults
@@ -0,0 +1,19 @@
+#!/bin/sh
+uci -q get dhcp.odhcpd && exit 0
+touch /etc/config/dhcp
+
+uci batch <<EOF
+set dhcp.odhcpd=odhcpd
+set dhcp.odhcpd.maindhcp=0
+set dhcp.odhcpd.leasefile=/tmp/hosts/odhcpd
+set dhcp.odhcpd.leasetrigger=/usr/sbin/odhcpd-update
+set dhcp.lan.dhcpv6=hybrid
+set dhcp.lan.ra=hybrid
+set dhcp.lan.ndp=hybrid
+set dhcp.wan6=dhcp
+set dhcp.wan6.dhcpv6=hybrid
+set dhcp.wan6.ra=hybrid
+set dhcp.wan6.ndp=hybrid
+set dhcp.wan6.master=1
+commit dhcp
+EOF