[ptxdist] udhcpd start script and config file

[ptxdist] udhcpd start script and config file

[Jean-Claude Monnin]

Hello,

I tried to add the udhcpd server from busybox in my image. It worked, but there is no option to add a start script and template config file for udhcpd. I'm using busybox init.
In case this should be included in ptxdist, please refer to the patches that are following.

Best regards,
Jean-Claude Monnin
-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/2] busybox: add generic config file for udhcpd

[Jean-Claude Monnin]

Signed-off-by: Jean-Claude Monnin <jc_monnin@emailplus.org>
---
generic/etc/udhcpd.conf | 115 ++++++++++++++++++++++++++++++++++++++++++++++++
rules/busybox.make      |   4 ++
2 files changed, 119 insertions(+)
create mode 100644 generic/etc/udhcpd.conf

diff --git a/generic/etc/udhcpd.conf b/generic/etc/udhcpd.conf
new file mode 100644
index 0000000..eca44c0
--- /dev/null
+++ b/generic/etc/udhcpd.conf
@@ -0,0 +1,115 @@
+# Sample udhcpd configuration file (/etc/udhcpd.conf)
+# Values shown are defaults
+
+# The start and end of the IP lease block
+start		192.168.0.20
+end		192.168.0.254
+
+# The interface that udhcpd will use
+interface	eth0
+
+# The maximum number of leases (includes addresses reserved
+# by OFFER's, DECLINE's, and ARP conflicts). Will be corrected
+# if it's bigger than IP lease block, but it ok to make it
+# smaller than lease block.
+#max_leases	254
+
+# The amount of time that an IP will be reserved (leased to nobody)
+# if a DHCP decline message is received (seconds)
+#decline_time	3600
+
+# The amount of time that an IP will be reserved
+# if an ARP conflict occurs (seconds)
+#conflict_time	3600
+
+# How long an offered address is reserved (seconds)
+#offer_time	60
+
+# If client asks for lease below this value, it will be rounded up
+# to this value (seconds)
+#min_lease	60
+
+# The location of the pid file
+#pidfile	/var/run/udhcpd.pid
+
+# The location of the leases file
+#lease_file	/var/lib/misc/udhcpd.leases
+
+# The time period at which udhcpd will write out leases file.
+# If this is 0, udhcpd will never automatically write leases file.
+# Specified in seconds.
+#auto_time	7200
+
+# Every time udhcpd writes a leases file, the below script will be called
+#notify_file			# default: no script
+#notify_file	dumpleases	# useful for debugging
+
+# The following are bootp specific options
+# next server to use in bootstrap
+#siaddr		192.168.0.22	# default: 0.0.0.0 (none)
+# tftp server name
+#sname		zorak		# default: none
+# tftp file to download (e.g. kernel image)
+#boot_file	/var/nfs_root	# default: none
+
+# Static leases map
+#static_lease 00:60:08:11:CE:4E 192.168.0.54
+#static_lease 00:60:08:11:CE:3E 192.168.0.44
+
+# The remainder of options are DHCP options and can be specified with the
+# keyword 'opt' or 'option'. If an option can take multiple items, such
+# as the dns option, they can be listed on the same line, or multiple
+# lines.
+# Examples:
+opt	dns	192.168.10.2 192.168.10.10
+option	subnet	255.255.255.0
+opt	router	192.168.10.2
+opt	wins	192.168.10.10
+option	dns	129.219.13.81	# appended to above DNS servers for a total of 3
+option	domain	local
+option	lease	864000		# default: 10 days
+option	msstaticroutes	10.0.0.0/8 10.127.0.1		# single static route
+option	staticroutes	10.0.0.0/8 10.127.0.1, 10.11.12.0/24 10.11.12.1
+# Arbitrary option in hex form:
+option	0x08	01020304	# option 8: "cookie server IP addr: 1.2.3.4"
+
+# Currently supported options (for more info, see options.c):
+#opt lease      NUM
+#opt subnet     IP
+#opt broadcast  IP
+#opt router     IP_LIST
+#opt ipttl      NUM
+#opt mtu        NUM
+#opt hostname   STRING		# client's hostname
+#opt domain     STRING		# client's domain suffix
+#opt search     STRING_LIST	# search domains
+#opt nisdomain  STRING
+#opt timezone   NUM		# (localtime - UTC_time) in seconds. signed
+#opt tftp       STRING		# tftp server name
+#opt bootfile   STRING		# tftp file to download (e.g. kernel image)
+#opt bootsize   NUM		# size of that file
+#opt rootpath   STRING		# (NFS) path to mount as root fs
+#opt wpad       STRING
+#opt serverid   IP		# default: server's IP
+#opt message    STRING		# error message (udhcpd sends it on success too)
+#opt vlanid     NUM		# 802.1P VLAN ID
+#opt vlanpriority NUM		# 802.1Q VLAN priority
+# Options specifying server(s)
+#opt dns        IP_LIST
+#opt wins       IP_LIST
+#opt nissrv     IP_LIST
+#opt ntpsrv     IP_LIST
+#opt lprsrv     IP_LIST
+#opt swapsrv    IP
+# Options specifying routes
+#opt routes     IP_PAIR_LIST
+#opt staticroutes   STATIC_ROUTES # RFC 3442 classless static route option
+#opt msstaticroutes STATIC_ROUTES # same, using MS option number
+# Obsolete options, no longer supported
+#opt logsrv     IP_LIST	# 704/UDP log server (not syslog!)
+#opt namesrv    IP_LIST	# IEN 116 name server, obsolete (August 1979!!!)
+#opt cookiesrv  IP_LIST	# RFC 865 "quote of the day" server, rarely (never?) used
+#opt timesrv    IP_LIST	# RFC 868 time server, rarely (never?) used
+# TODO: in development
+#opt userclass  STRING		# RFC 3004. set of LASCII strings. "I am a printer" etc
+#opt sipserv    STRING LIST	# RFC 3361. flag byte, then: 0: domain names, 1: IP addrs
diff --git a/rules/busybox.make b/rules/busybox.make
index 31ef1ee..c02f594 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -222,6 +222,10 @@ ifdef PTXCONF_BUSYBOX_FEATURE_MDEV_CONF
	@$(call install_alternative, busybox, 0, 0, 0644, /etc/mdev.conf)
endif

+ifdef PTXCONF_BUSYBOX_UDHCPD
+	@$(call install_alternative, busybox, 0, 0, 0644, /etc/udhcpd.conf)
+endif
+
ifdef PTXCONF_BUSYBOX_UDHCPC
	@$(call install_alternative, busybox, 0, 0, 0754, /etc/udhcpc.script)
	@$(call install_link, busybox, ../../../etc/udhcpc.script, /usr/share/udhcpc/default.script)
-- 
1.8.1.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] busybox: add option to install udhcpd start script

[Jean-Claude Monnin]

Signed-off-by: Jean-Claude Monnin <jc_monnin@emailplus.org>
---
 generic/etc/init.d/udhcpd | 21 +++++++++++++++++++++
 rules/busybox-bbinit.in   |  6 ++++++
 rules/busybox.in          |  6 ++++++
 rules/busybox.make        | 10 ++++++++++
 4 files changed, 43 insertions(+)
 create mode 100644 generic/etc/init.d/udhcpd

diff --git a/generic/etc/init.d/udhcpd b/generic/etc/init.d/udhcpd
new file mode 100644
index 0000000..a10226e
--- /dev/null
+++ b/generic/etc/init.d/udhcpd
@@ -0,0 +1,21 @@
+#!/bin/sh
+#
+# /etc/init.d/udhcpd
+#
+# $Id$
+#
+
+if [ -f /usr/sbin/udhcpd ]; then
+	echo "Starting udhcpd..."
+	/usr/sbin/udhcpd
+	exit 0
+fi
+
+if [ -f /sbin/udhcpd ]; then
+	echo "Starting udhcpd..."
+	/sbin/udhcpd -d
+	exit 0
+fi
+
+echo "No udhcpd found. Aborting"
+
diff --git a/rules/busybox-bbinit.in b/rules/busybox-bbinit.in
index d414a51..65c8c79 100644
--- a/rules/busybox-bbinit.in
+++ b/rules/busybox-bbinit.in
@@ -30,6 +30,12 @@ config BUSYBOX_TELNETD_BBINIT_LINK
 	prompt "telnetd"
 	default "S16telnetd"
 
+config BUSYBOX_UDHCPD_BBINIT_LINK
+	string
+	depends on BUSYBOX_UDHCPD_STARTSCRIPT
+	prompt "udhcpd"
+	default "S60udpcpd"
+
 config BUSYBOX_BB_SYSCTL_BBINIT_LINK
 	string
 	depends on BUSYBOX_BB_SYSCTL_STARTSCRIPT
diff --git a/rules/busybox.in b/rules/busybox.in
index 28a68a3..7a41e7c 100644
--- a/rules/busybox.in
+++ b/rules/busybox.in
@@ -52,6 +52,12 @@ choice
 		  start busybox telnetd server from inetd
 endchoice
 
+config BUSYBOX_UDHCPD_STARTSCRIPT
+	bool
+	depends on BUSYBOX_UDHCPD
+	default y
+	prompt "Install /etc/init.d/udhcpd"
+
 config BUSYBOX_SYSLOGD_STARTSCRIPT
 	bool
 	depends on BUSYBOX_SYSLOGD
diff --git a/rules/busybox.make b/rules/busybox.make
index c02f594..385b2c4 100644
--- a/rules/busybox.make
+++ b/rules/busybox.make
@@ -163,6 +163,16 @@ ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_TELNETD_BBINIT_LINK)),)
 endif
 endif
 
+ifdef PTXCONF_BUSYBOX_UDHCPD_STARTSCRIPT
+	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/udhcpd)
+
+ifneq ($(call remove_quotes,$(PTXCONF_BUSYBOX_UDHCPD_BBINIT_LINK)),)
+	@$(call install_link, busybox, \
+		../init.d/udhcpd, \
+		/etc/rc.d/$(PTXCONF_BUSYBOX_UDHCPD_BBINIT_LINK))
+endif
+endif
+
 ifdef PTXCONF_BUSYBOX_SYSLOGD_STARTSCRIPT
 	@$(call install_alternative, busybox, 0, 0, 0755, /etc/init.d/syslogd)
 
-- 
1.8.1.2


-- 
ptxdist mailing list
ptxdist@pengutronix.de