install_alternative already looks for the config files in various places, there is no need for kconfig switches here. These options are probably a leftover from the very early years of PTXdist.
Signed-off-by: Roland Hieber <[email protected]> --- rules/dhcp.in | 33 --------------------------------- rules/dhcp.make | 9 --------- 2 files changed, 42 deletions(-) diff --git a/rules/dhcp.in b/rules/dhcp.in index 7e609f74d432..7eefb16c6414 100644 --- a/rules/dhcp.in +++ b/rules/dhcp.in @@ -28,17 +28,6 @@ config DHCP_SERVER It takes its configuration from /etc/dhcp3/dhcpd.conf and tracks issued addresses as records in the dhcpd.leases file. -config DHCP_DHCPD_CONF - bool "Install /etc/dhcpd.conf" - depends on DHCP_SERVER - default y - help - Installs (if present) the "./projectroot/etc/dhcpd.conf" - file from your workspace, otherwise a generic one from the - ptxdist installation - ("<PTXDIST>/projectroot/etc/dhcpd.conf"). - - config DHCP_CLIENT bool prompt "DHCP Client dhclient" @@ -47,28 +36,6 @@ config DHCP_CLIENT with an IP address. It also handles a lease refresh if it expires. -if DHCP_CLIENT - -config DHCP_DHCLIENT_CONF - bool "Install /etc/dhclient.conf" - default y - help - Installs (if present) the "./projectroot/etc/dhclient.conf" - file from your workspace, otherwise a generic one from the - ptxdist installation - ("<PTXDIST>/projectroot/etc/dhclient.conf"). - -config DHCP_DHCLIENT_SCRIPT - bool "Install /etc/dhclient-script" - depends on DHCP_DHCLIENT_CONF - help - Installs (if present) the "./projectroot/etc/dhclient-script" - file from your workspace, otherwise a generic one from the - ptxdist installation - ("<PTXDIST>/projectroot/etc/dhclient-script"). - -endif - config DHCP_RELAY bool prompt "DHCP Relay dhcrelay" diff --git a/rules/dhcp.make b/rules/dhcp.make index 48ff6f0d2007..7feb6ef5b668 100644 --- a/rules/dhcp.make +++ b/rules/dhcp.make @@ -93,9 +93,6 @@ $(STATEDIR)/dhcp.targetinstall: ifdef PTXCONF_DHCP_SERVER @$(call install_copy, dhcp, 0, 0, 0755, -, \ /usr/sbin/dhcpd) -endif - -ifdef PTXCONF_DHCP_DHCPD_CONF @$(call install_alternative, dhcp, 0, 0, 0644, /etc/dhcpd.conf) endif @@ -106,13 +103,7 @@ ifdef PTXCONF_DHCP_CLIENT @$(call install_copy, dhcp, 0, 0, 0755, -, \ /usr/sbin/dhclient) -endif - -ifdef PTXCONF_DHCP_DHCLIENT_SCRIPT @$(call install_alternative, dhcp, 0, 0, 0755, /etc/dhclient-script) -endif - -ifdef PTXCONF_DHCP_DHCLIENT_CONF @$(call install_alternative, dhcp, 0, 0, 0644, /etc/dhclient.conf) endif -- 2.29.2 _______________________________________________ ptxdist mailing list [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
