[OpenWrt-Devel] [PATCH v2] [Packages] isc-dhcp-relay: Add init scripts for ipv4 and ipv6 as well as config file

[Jérôme Poulin]

I cleaned up the patch so line do not overflow and removed some white
space in hope to get it accepted or revised.

As isc-dhcp-relay does not come with an init script, I made one based
on sysntpd init.d file for both ipv4 and ipv6.

If you need more arguments from isc-dhcp-relay to be included in the
config file, I'll be able to add them.

This patch has been applied to trunk and compiles/install on my side.

The script for ipv4 and ipv6 have been tested with the
isc-dhcp-relay-ipv6 binary and work well (start/stop with the right
settings).

Signed-off-by: Jérôme Poulin <***@gmail.com>
Index: Makefile
===================================================================
--- Makefile (revision 34179)
+++ Makefile (working copy)
@@ -171,8 +171,13 @@
endef

define Package/isc-dhcp-relay-$(BUILD_VARIANT)/install
- $(INSTALL_DIR) $(1)/usr/sbin
+ $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/dhcrelay $(1)/usr/sbin
+ $(INSTALL_DATA) ./files/etc/config/dhcrelay $(1)/etc/config
+ $(INSTALL_BIN) ./files/dhcrelay4.init $(1)/etc/init.d/dhcrelay4
+ifeq ($(BUILD_VARIANT),ipv6)
+ $(INSTALL_BIN) ./files/dhcrelay6.init $(1)/etc/init.d/dhcrelay6
+endif
endef

define Package/isc-dhcp-server-$(BUILD_VARIANT)/install
Index: files/dhcrelay4.init
===================================================================
--- files/dhcrelay4.init (revision 0)
+++ files/dhcrelay4.init (working copy)
@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2012 OpenWrt.org
+
+START=91
+
+SERVICE_SIG="KILL"
+SERVICE_PID_FILE="/var/run/dhcrelay4.pid"
+SERVICE_USE_PID=1
+
+start() {
+ local relay_dhcpserver
+
+ config_load dhcrelay
+ config_get relay_dhcpserver ipv4 dhcpserver
+
+ service_start /usr/sbin/dhcrelay -4 -q \
+ -pf $SERVICE_PID_FILE $relay_dhcpserver
+}
+
+stop() {
+ service_stop /usr/sbin/dhcrelay
+}
Index: files/dhcrelay6.init
===================================================================
--- files/dhcrelay6.init (revision 0)
+++ files/dhcrelay6.init (working copy)
@@ -0,0 +1,42 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2012 OpenWrt.org
+
+START=91
+
+SERVICE_SIG="KILL"
+SERVICE_PID_FILE="/var/run/dhcrelay6.pid"
+SERVICE_USE_PID=1
+
+start() {
+ local relay_dhcpserver
+ local relay_upper
+ local relay_lowers
+ local relay_lower_args
+
+ config_load dhcrelay
+ config_get relay_dhcpserver ipv6 dhcpserver
+ config_get relay_upper ipv6 upper
+ config_get relay_lowers ipv6 lower
+
+ # If a specific DHCP server is specified,
+ # add it to the upper interface.
+ if [ -n "$relay_dhcpserver" ]; then
+ relay_upper="${relay_dhcpserver}%$relay_upper"
+ fi
+
+ # Add all lower interfaces at the end.
+ if [ -n "$relay_lowers" ]; then
+ local relay_lower
+ for relay_lower in $relay_lowers; do
+ append relay_lower_args "-l $relay_lower"
+ done
+ fi
+
+ service_start /usr/sbin/dhcrelay -6 -q \
+ -pf $SERVICE_PID_FILE \
+ -u $relay_upper $relay_lower_args
+}
+
+stop() {
+ service_stop /usr/sbin/dhcrelay
+}
Index: files/etc/config/dhcrelay
===================================================================
--- files/etc/config/dhcrelay (revision 0)
+++ files/etc/config/dhcrelay (working copy)
@@ -0,0 +1,10 @@
+
+config dhcrelay ipv4
+ option dhcpserver '192.0.2.10'
+
+config dhcrelay ipv6
+# option dhcpserver '2001:db8:1::1'
+ option upper 'eth1'
+ list lower 'eth0.2'
+ list lower 'eth0.3'
+

[Florian Fainelli]

Post by Jérôme Poulin
I cleaned up the patch so line do not overflow and removed some white
space in hope to get it accepted or revised.
As isc-dhcp-relay does not come with an init script, I made one based
on sysntpd init.d file for both ipv4 and ipv6.
If you need more arguments from isc-dhcp-relay to be included in the
config file, I'll be able to add them.
This patch has been applied to trunk and compiles/install on my side.
The script for ipv4 and ipv6 have been tested with the
isc-dhcp-relay-ipv6 binary and work well (start/stop with the right
settings).

Applied in r34485, thanks!
--
Florian