From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Tue, 29 Jun 2021 07:11:51 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly62J-0007FG-1d for lore@lore.pengutronix.de; Tue, 29 Jun 2021 07:11:51 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly62I-0000IN-Lc; Tue, 29 Jun 2021 07:11:50 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ly5zw-0005gj-PZ; Tue, 29 Jun 2021 07:09:24 +0200 Received: from [2a0a:edc0:0:1101:1d::39] (helo=dude03.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1ly5zw-0005cy-8X; Tue, 29 Jun 2021 07:09:24 +0200 Received: from mol by dude03.red.stw.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1ly5zw-00Aahd-5h; Tue, 29 Jun 2021 07:09:24 +0200 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Tue, 29 Jun 2021 07:09:24 +0200 Message-Id: <20210629050924.2524322-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210620171046.25968-1-rhi@pengutronix.de> References: <20210620171046.25968-1-rhi@pengutronix.de> MIME-Version: 1.0 Subject: Re: [ptxdist] [APPLIED] dhcp: always install the config files X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Roland Hieber Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as cbfad6fdae50738af2a0b36558e9bec71efebe02. Michael [sent from post-receive hook] On Tue, 29 Jun 2021 07:09:23 +0200, Roland Hieber wrote: > 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 > Message-Id: <20210620171046.25968-1-rhi@pengutronix.de> > Signed-off-by: Michael Olbrich > > 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 > - ("/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 > - ("/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 > - ("/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 > _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de