diff options
author | Juergen Beisert <j.beisert@pengutronix.de> | 2006-12-21 15:10:16 +0000 |
---|---|---|
committer | Juergen Beisert <j.beisert@pengutronix.de> | 2006-12-21 15:10:16 +0000 |
commit | cdbfba02e44512b8bdb203e65f38c26955b1788d (patch) | |
tree | 4c2ed9c5da6fb8c25bfb0a40d1c1c4b270e07a78 | |
parent | 274f856ab0279716ede72913127f98ac6f2d8d21 (diff) | |
download | ptxdist-cdbfba02e44512b8bdb203e65f38c26955b1788d.tar.gz ptxdist-cdbfba02e44512b8bdb203e65f38c26955b1788d.tar.xz |
* dhcp: modify dhclient to make it work
- support installation of dhclient.conf
- installs also the required script dhclient calls
to setup the interface
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6567 33e552b5-05e3-0310-8538-816dae2090ed
-rw-r--r-- | rules/dhcp.in | 63 | ||||
-rw-r--r-- | rules/dhcp.make | 23 |
2 files changed, 66 insertions, 20 deletions
diff --git a/rules/dhcp.in b/rules/dhcp.in index affd995e3..59a910cfd 100644 --- a/rules/dhcp.in +++ b/rules/dhcp.in @@ -5,12 +5,12 @@ menuconfig DHCP This is the DHCP server from version 3 of the Internet Software Consortium DHCP package. For more information visit the ISC web site at http://www.isc.org. - - Dynamic Host Configuration Protocol (DHCP) is a protocol like - BOOTP (actually dhcpd includes much of the functionality of - BOOTPD!). It assigns IP addresses to clients based on lease - times. - + + Dynamic Host Configuration Protocol (DHCP) is a protocol like + BOOTP (actually dhcpd includes much of the functionality of + BOOTPD!). It assigns IP addresses to clients based on lease + times. + Multiple Ethernet Interfaces are supported by this DHCP package. @@ -22,16 +22,47 @@ config DHCP_SERVER FIXME config DHCP_CLIENT - bool - depends on DHCP - prompt "DHCP Client dhclient" - help - FIXME + bool + depends on DHCP + prompt "DHCP Client dhclient" + help + This is a client process to provide the system it runs on + with an IP adress. It also handles a lease refresh if it + expires. + +config DHCP_CLIENT_CONFIG + bool + depends on DHCP_CLIENT + prompt "Install /etc/dhclient.conf" + help + PTXdist installs a /etc/dhclient.conf from a selectable source. + +choice + prompt "Kind of dhclient.conf" + default DHCP_CLIENT_CONFIG_DEFAULT + depends on DHCP_CLIENT_CONFIG + + config DHCP_CLIENT_CONFIG_DEFAULT + bool + prompt "Use generic" + help + Installs a generic /etc/dhclient.conf from the dhcp package. + See <build-target/dhcp-?.?.?/client/dhclient.conf + + config DHCP_CLIENT_CONFIG_USER + bool + prompt "User defined" + help + This uses a user defined /etc/dhclient.conf file. PTXdist + uses files projectroot/etc/dhclient.conf in your local + project + +endchoice config DHCP_RELAY - bool - depends on DHCP - prompt "DHCP Relay dhcrelay" - help - FIXME + bool + depends on DHCP + prompt "DHCP Relay dhcrelay" + help + FIXME diff --git a/rules/dhcp.make b/rules/dhcp.make index b2b2e4ea2..986499dfc 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -2,7 +2,7 @@ # $Id$ # # Copyright (C) 2003 by Benedikt Spranger -# +# # See CREDITS for details about who has contributed to this project. # # For further information about the PTXdist project and license conditions @@ -17,7 +17,7 @@ PACKAGES-$(PTXCONF_DHCP) += dhcp # # Paths and names # -DHCP_VERSION = 3.0.4 +DHCP_VERSION = 3.0.5 DHCP = dhcp-$(DHCP_VERSION) DHCP_SUFFIX = tar.gz DHCP_URL = ftp://ftp.isc.org/isc/dhcp/$(DHCP).$(DHCP_SUFFIX) @@ -112,11 +112,26 @@ $(STATEDIR)/dhcp.targetinstall: $(dhcp_targetinstall_deps_default) @$(call install_fixup, dhcp,DESCRIPTION,missing) ifdef PTXCONF_DHCP_SERVER - @$(call install_copy, dhcp, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/server/dhcpd, /sbin/dhcpd) + @$(call install_copy, dhcp, 0, 0, 0755, \ + $(DHCP_DIR)/work.linux-2.2/server/dhcpd, /sbin/dhcpd) endif ifdef PTXCONF_DHCP_CLIENT - @$(call install_copy, dhcp, 0, 0, 0755, $(DHCP_DIR)/work.linux-2.2/client/dhclient, /sbin/dhclient) + @$(call install_copy, dhcp, 0, 0, 0755, \ + $(DHCP_DIR)/work.linux-2.2/client/dhclient, /sbin/dhclient) + @$(call install_copy, dhcp, 0, 0, 0755, /var/state/dhcp ) + +ifdef PTXCONF_DHCP_CLIENT_CONFIG_DEFAULT + @$(call install_copy, dhcp, 0, 0, 0755, \ + $(DHCP_DIR)/client/dhclient.conf, /etc/dhclient.conf, n) +endif +ifdef PTXCONF_DHCP_CLIENT_CONFIG_USER + @$(call install_copy, dhcp, 0, 0, 0755, \ + ${PTXDIST_WORKSPACE}/projectroot/etc/dhclient.conf, \ + /etc/dhclient.conf, n) +endif + @$(call install_copy, dhcp, 0, 0, 0755, \ + $(DHCP_DIR)/client/scripts/linux, /sbin/dhclient-script, n) endif ifdef PTXCONF_DHCP_RELAY |