[ptxdist] [PATCH 1/4] dhcp: always install the config files

[ptxdist] [PATCH 1/4] dhcp: always install the config files

[Roland Hieber]

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 <rhi@pengutronix.de>
---
 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
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 2/4] dhcp: set reasonable default options

[Roland Hieber]

If this package is selected, it is probably because of the server, of
because the busybox DHCP client was not powerful enough.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/dhcp.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/dhcp.in b/rules/dhcp.in
index 7eefb16c6414..859b939eebc9 100644
--- a/rules/dhcp.in
+++ b/rules/dhcp.in
@@ -20,6 +20,7 @@ if DHCP
 
 config DHCP_SERVER
 	bool
+	default y
 	prompt "DHCP Server dhcpd"
 	help
 	  This is the main component of the DHCP server, the daemon process
@@ -30,6 +31,7 @@ config DHCP_SERVER
 
 config DHCP_CLIENT
 	bool
+	default y
 	prompt "DHCP Client dhclient"
 	help
 	  This is a client process to provide the system it runs on
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 3/4] dhcp: warn in the menu if nothing is installed into the rootfs

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/dhcp.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rules/dhcp.in b/rules/dhcp.in
index 859b939eebc9..06ba29080f2c 100644
--- a/rules/dhcp.in
+++ b/rules/dhcp.in
@@ -1,4 +1,8 @@
 ## SECTION=networking
+
+comment "Note: no DHCP binaries are currently selected"
+	depends on DHCP && !DHCP_SERVER && !DHCP_CLIENT && !DHCP_RELAY
+
 menuconfig DHCP
 	tristate
 	prompt "dhcp                          "
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH 4/4] dhcp: sync config files with upstream examples

[Roland Hieber]

Copy the following files from the ISC DHCP tree:

* client/dhclient.conf.example
* server/dhcpd.conf.example

and comment out all lines, so they serve as examples only and don't
configure any strange things on the target.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 projectroot/etc/dhclient.conf |  14 +--
 projectroot/etc/dhcpd.conf    | 198 +++++++++++++++++-----------------
 2 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/projectroot/etc/dhclient.conf b/projectroot/etc/dhclient.conf
index 6a994e6ed0b6..1adf4dd7c75f 100644
--- a/projectroot/etc/dhclient.conf
+++ b/projectroot/etc/dhclient.conf
@@ -1,10 +1,10 @@
-#send host-name "andare.fugue.com";
+#send host-name = pick-first-value(gethostname(), "ISC-dhclient");
 #send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
 #send dhcp-lease-time 3600;
-#supersede domain-name "fugue.com home.vix.com";
+#supersede domain-search "example.com", "isc.org";
 #prepend domain-name-servers 127.0.0.1;
-request subnet-mask, broadcast-address, time-offset, routers,
-	domain-name, domain-name-servers, host-name;
+#request subnet-mask, broadcast-address, time-offset, routers,
+#	domain-name, domain-name-servers, host-name;
 #require subnet-mask, domain-name-servers;
 #timeout 60;
 #retry 60;
@@ -14,18 +14,18 @@ request subnet-mask, broadcast-address, time-offset, routers,
 #script "/etc/dhclient-script";
 #media "-link0 -link1 -link2", "link0 link1";
 #reject 192.33.137.209;
-
+#
 #alias {
 #  interface "ep0";
 #  fixed-address 192.5.5.213;
 #  option subnet-mask 255.255.255.255;
 #}
-
+#
 #lease {
 #  interface "ep0";
 #  fixed-address 192.33.137.200;
 #  medium "link0 link1";
-#  option host-name "andare.swiftmedia.com";
+#  option host-name "andare.example.com";
 #  option subnet-mask 255.255.255.0;
 #  option broadcast-address 192.33.137.255;
 #  option routers 192.33.137.250;
diff --git a/projectroot/etc/dhcpd.conf b/projectroot/etc/dhcpd.conf
index 5eab9516d4fe..7fc12882c985 100644
--- a/projectroot/etc/dhcpd.conf
+++ b/projectroot/etc/dhcpd.conf
@@ -3,102 +3,102 @@
 # Sample configuration file for ISC dhcpd
 #
 
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# Use this to enble / disable dynamic dns updates globally.
-#ddns-update-style none;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-#authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-log-facility local7;
-
-# No service will be given on this subnet, but declaring it helps the 
-# DHCP server to understand the network topology.
-
-subnet 10.152.187.0 netmask 255.255.255.0 {
-}
-
-# This is a very basic subnet declaration.
-
-subnet 10.254.239.0 netmask 255.255.255.224 {
-  range 10.254.239.10 10.254.239.20;
-  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
-}
-
-# This declaration allows BOOTP clients to get dynamic addresses,
-# which we don't really recommend.
-
-subnet 10.254.239.32 netmask 255.255.255.224 {
-  range dynamic-bootp 10.254.239.40 10.254.239.60;
-  option broadcast-address 10.254.239.31;
-  option routers rtr-239-32-1.example.org;
-}
-
-# A slightly different configuration for an internal subnet.
-subnet 10.5.5.0 netmask 255.255.255.224 {
-  range 10.5.5.26 10.5.5.30;
-  option domain-name-servers ns1.internal.example.org;
-  option domain-name "internal.example.org";
-  option routers 10.5.5.1;
-  option broadcast-address 10.5.5.31;
-  default-lease-time 600;
-  max-lease-time 7200;
-}
-
-# Hosts which require special configuration options can be listed in
-# host statements.   If no address is specified, the address will be
-# allocated dynamically (if possible), but the host-specific information
-# will still come from the host declaration.
-
-host passacaglia {
-  hardware ethernet 0:0:c0:5d:bd:95;
-  filename "vmunix.passacaglia";
-  server-name "toccata.fugue.com";
-}
-
-# Fixed IP addresses can also be specified for hosts.   These addresses
-# should not also be listed as being available for dynamic assignment.
-# Hosts for which fixed IP addresses have been specified can boot using
-# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
-# be booted with DHCP, unless there is an address range on the subnet
-# to which a BOOTP client is connected which has the dynamic-bootp flag
-# set.
-host fantasia {
-  hardware ethernet 08:00:07:26:c0:a5;
-  fixed-address fantasia.fugue.com;
-}
-
-# You can declare a class of clients and then do address allocation
-# based on that.   The example below shows a case where all clients
-# in a certain class get addresses on the 10.17.224/24 subnet, and all
-# other clients get addresses on the 10.0.29/24 subnet.
-
-class "foo" {
-  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
-}
-
-shared-network 224-29 {
-  subnet 10.17.224.0 netmask 255.255.255.0 {
-    option routers rtr-224.example.org;
-  }
-  subnet 10.0.29.0 netmask 255.255.255.0 {
-    option routers rtr-29.example.org;
-  }
-  pool {
-    allow members of "foo";
-    range 10.17.224.10 10.17.224.250;
-  }
-  pool {
-    deny members of "foo";
-    range 10.0.29.10 10.0.29.230;
-  }
-}
+## option definitions common to all supported networks...
+#option domain-name "example.org";
+#option domain-name-servers ns1.example.org, ns2.example.org;
+#
+#default-lease-time 600;
+#max-lease-time 7200;
+#
+## Use this to enble / disable dynamic dns updates globally.
+##ddns-update-style none;
+#
+## If this DHCP server is the official DHCP server for the local
+## network, the authoritative directive should be uncommented.
+##authoritative;
+#
+## Use this to send dhcp log messages to a different log file (you also
+## have to hack syslog.conf to complete the redirection).
+#log-facility local7;
+#
+## No service will be given on this subnet, but declaring it helps the
+## DHCP server to understand the network topology.
+#
+#subnet 10.152.187.0 netmask 255.255.255.0 {
+#}
+#
+## This is a very basic subnet declaration.
+#
+#subnet 10.254.239.0 netmask 255.255.255.224 {
+#  range 10.254.239.10 10.254.239.20;
+#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
+#}
+#
+## This declaration allows BOOTP clients to get dynamic addresses,
+## which we don't really recommend.
+#
+#subnet 10.254.239.32 netmask 255.255.255.224 {
+#  range dynamic-bootp 10.254.239.40 10.254.239.60;
+#  option broadcast-address 10.254.239.31;
+#  option routers rtr-239-32-1.example.org;
+#}
+#
+## A slightly different configuration for an internal subnet.
+#subnet 10.5.5.0 netmask 255.255.255.224 {
+#  range 10.5.5.26 10.5.5.30;
+#  option domain-name-servers ns1.internal.example.org;
+#  option domain-name "internal.example.org";
+#  option routers 10.5.5.1;
+#  option broadcast-address 10.5.5.31;
+#  default-lease-time 600;
+#  max-lease-time 7200;
+#}
+#
+## Hosts which require special configuration options can be listed in
+## host statements.   If no address is specified, the address will be
+## allocated dynamically (if possible), but the host-specific information
+## will still come from the host declaration.
+#
+#host passacaglia {
+#  hardware ethernet 0:0:c0:5d:bd:95;
+#  filename "vmunix.passacaglia";
+#  server-name "toccata.example.com";
+#}
+#
+## Fixed IP addresses can also be specified for hosts.   These addresses
+## should not also be listed as being available for dynamic assignment.
+## Hosts for which fixed IP addresses have been specified can boot using
+## BOOTP or DHCP.   Hosts for which no fixed address is specified can only
+## be booted with DHCP, unless there is an address range on the subnet
+## to which a BOOTP client is connected which has the dynamic-bootp flag
+## set.
+#host fantasia {
+#  hardware ethernet 08:00:07:26:c0:a5;
+#  fixed-address fantasia.example.com;
+#}
+#
+## You can declare a class of clients and then do address allocation
+## based on that.   The example below shows a case where all clients
+## in a certain class get addresses on the 10.17.224/24 subnet, and all
+## other clients get addresses on the 10.0.29/24 subnet.
+#
+#class "foo" {
+#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
+#}
+#
+#shared-network 224-29 {
+#  subnet 10.17.224.0 netmask 255.255.255.0 {
+#    option routers rtr-224.example.org;
+#  }
+#  subnet 10.0.29.0 netmask 255.255.255.0 {
+#    option routers rtr-29.example.org;
+#  }
+#  pool {
+#    allow members of "foo";
+#    range 10.17.224.10 10.17.224.250;
+#  }
+#  pool {
+#    deny members of "foo";
+#    range 10.0.29.10 10.0.29.230;
+#  }
+#}
-- 
2.29.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 2/4] dhcp: set reasonable default options

[Michael Olbrich]

On Sun, Jun 20, 2021 at 07:10:44PM +0200, Roland Hieber wrote:
> If this package is selected, it is probably because of the server, of
> because the busybox DHCP client was not powerful enough.

Hmm, it's often either of the two, not both. So you would need to change
something anyways. And if both are disabled then it's actually noticeable
at runtime. If it's enabled by default then changes are that nobody notices
that something should be disabled.

Michael

> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/dhcp.in | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/dhcp.in b/rules/dhcp.in
> index 7eefb16c6414..859b939eebc9 100644
> --- a/rules/dhcp.in
> +++ b/rules/dhcp.in
> @@ -20,6 +20,7 @@ if DHCP
>  
>  config DHCP_SERVER
>  	bool
> +	default y
>  	prompt "DHCP Server dhcpd"
>  	help
>  	  This is the main component of the DHCP server, the daemon process
> @@ -30,6 +31,7 @@ config DHCP_SERVER
>  
>  config DHCP_CLIENT
>  	bool
> +	default y
>  	prompt "DHCP Client dhclient"
>  	help
>  	  This is a client process to provide the system it runs on
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/4] dhcp: warn in the menu if nothing is installed into the rootfs

[Michael Olbrich]

On Sun, Jun 20, 2021 at 07:10:45PM +0200, Roland Hieber wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  rules/dhcp.in | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/rules/dhcp.in b/rules/dhcp.in
> index 859b939eebc9..06ba29080f2c 100644
> --- a/rules/dhcp.in
> +++ b/rules/dhcp.in
> @@ -1,4 +1,8 @@
>  ## SECTION=networking
> +
> +comment "Note: no DHCP binaries are currently selected"
> +	depends on DHCP && !DHCP_SERVER && !DHCP_CLIENT && !DHCP_RELAY
> +

I think this should be below the 'dhcp' entry in the menu.

Michael

>  menuconfig DHCP
>  	tristate
>  	prompt "dhcp                          "
> -- 
> 2.29.2
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/4] dhcp: warn in the menu if nothing is installed into the rootfs

[Roland Hieber]

On Fri, Jun 25, 2021 at 09:58:18AM +0200, Michael Olbrich wrote:
> On Sun, Jun 20, 2021 at 07:10:45PM +0200, Roland Hieber wrote:
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> >  rules/dhcp.in | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/rules/dhcp.in b/rules/dhcp.in
> > index 859b939eebc9..06ba29080f2c 100644
> > --- a/rules/dhcp.in
> > +++ b/rules/dhcp.in
> > @@ -1,4 +1,8 @@
> >  ## SECTION=networking
> > +
> > +comment "Note: no DHCP binaries are currently selected"
> > +	depends on DHCP && !DHCP_SERVER && !DHCP_CLIENT && !DHCP_RELAY
> > +
> 
> I think this should be below the 'dhcp' entry in the menu.

Yes, I think so too, but I couldn't get it to work, it always showed up
in the isc-dhcp submenu even when I added it after the "endif" :-/

 - Roland

> 
> Michael
> 
> >  menuconfig DHCP
> >  	tristate
> >  	prompt "dhcp                          "
> > -- 
> > 2.29.2

-- 
Roland Hieber, Pengutronix e.K.          | r.hieber@pengutronix.de     |
Steuerwalder Str. 21                     | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686         | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH 3/4] dhcp: warn in the menu if nothing is installed into the rootfs

[Michael Olbrich]

On Sat, Jun 26, 2021 at 10:16:49PM +0200, Roland Hieber wrote:
> On Fri, Jun 25, 2021 at 09:58:18AM +0200, Michael Olbrich wrote:
> > On Sun, Jun 20, 2021 at 07:10:45PM +0200, Roland Hieber wrote:
> > > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > > ---
> > >  rules/dhcp.in | 4 ++++
> > >  1 file changed, 4 insertions(+)
> > > 
> > > diff --git a/rules/dhcp.in b/rules/dhcp.in
> > > index 859b939eebc9..06ba29080f2c 100644
> > > --- a/rules/dhcp.in
> > > +++ b/rules/dhcp.in
> > > @@ -1,4 +1,8 @@
> > >  ## SECTION=networking
> > > +
> > > +comment "Note: no DHCP binaries are currently selected"
> > > +	depends on DHCP && !DHCP_SERVER && !DHCP_CLIENT && !DHCP_RELAY
> > > +
> > 
> > I think this should be below the 'dhcp' entry in the menu.
> 
> Yes, I think so too, but I couldn't get it to work, it always showed up
> in the isc-dhcp submenu even when I added it after the "endif" :-/

The trick is to put an invisible comment in between. I've applied it with a
fixup.

Michael


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] dhcp: always install the config files

[Michael Olbrich]

Thanks, applied as cbfad6fdae50738af2a0b36558e9bec71efebe02.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:23 +0200, Roland Hieber <rhi@pengutronix.de> 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 <rhi@pengutronix.de>
> Message-Id: <20210620171046.25968-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> 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
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] dhcp: sync config files with upstream examples

[Michael Olbrich]

Thanks, applied as debaad719ce27a27408b059cff2c5cc26ff3da4f.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:25 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Copy the following files from the ISC DHCP tree:
> 
> * client/dhclient.conf.example
> * server/dhcpd.conf.example
> 
> and comment out all lines, so they serve as examples only and don't
> configure any strange things on the target.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210620171046.25968-4-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/projectroot/etc/dhclient.conf b/projectroot/etc/dhclient.conf
> index 6a994e6ed0b6..1adf4dd7c75f 100644
> --- a/projectroot/etc/dhclient.conf
> +++ b/projectroot/etc/dhclient.conf
> @@ -1,10 +1,10 @@
> -#send host-name "andare.fugue.com";
> +#send host-name = pick-first-value(gethostname(), "ISC-dhclient");
>  #send dhcp-client-identifier 1:0:a0:24:ab:fb:9c;
>  #send dhcp-lease-time 3600;
> -#supersede domain-name "fugue.com home.vix.com";
> +#supersede domain-search "example.com", "isc.org";
>  #prepend domain-name-servers 127.0.0.1;
> -request subnet-mask, broadcast-address, time-offset, routers,
> -	domain-name, domain-name-servers, host-name;
> +#request subnet-mask, broadcast-address, time-offset, routers,
> +#	domain-name, domain-name-servers, host-name;
>  #require subnet-mask, domain-name-servers;
>  #timeout 60;
>  #retry 60;
> @@ -14,18 +14,18 @@ request subnet-mask, broadcast-address, time-offset, routers,
>  #script "/etc/dhclient-script";
>  #media "-link0 -link1 -link2", "link0 link1";
>  #reject 192.33.137.209;
> -
> +#
>  #alias {
>  #  interface "ep0";
>  #  fixed-address 192.5.5.213;
>  #  option subnet-mask 255.255.255.255;
>  #}
> -
> +#
>  #lease {
>  #  interface "ep0";
>  #  fixed-address 192.33.137.200;
>  #  medium "link0 link1";
> -#  option host-name "andare.swiftmedia.com";
> +#  option host-name "andare.example.com";
>  #  option subnet-mask 255.255.255.0;
>  #  option broadcast-address 192.33.137.255;
>  #  option routers 192.33.137.250;
> diff --git a/projectroot/etc/dhcpd.conf b/projectroot/etc/dhcpd.conf
> index 5eab9516d4fe..7fc12882c985 100644
> --- a/projectroot/etc/dhcpd.conf
> +++ b/projectroot/etc/dhcpd.conf
> @@ -3,102 +3,102 @@
>  # Sample configuration file for ISC dhcpd
>  #
>  
> -# option definitions common to all supported networks...
> -option domain-name "example.org";
> -option domain-name-servers ns1.example.org, ns2.example.org;
> -
> -default-lease-time 600;
> -max-lease-time 7200;
> -
> -# Use this to enble / disable dynamic dns updates globally.
> -#ddns-update-style none;
> -
> -# If this DHCP server is the official DHCP server for the local
> -# network, the authoritative directive should be uncommented.
> -#authoritative;
> -
> -# Use this to send dhcp log messages to a different log file (you also
> -# have to hack syslog.conf to complete the redirection).
> -log-facility local7;
> -
> -# No service will be given on this subnet, but declaring it helps the 
> -# DHCP server to understand the network topology.
> -
> -subnet 10.152.187.0 netmask 255.255.255.0 {
> -}
> -
> -# This is a very basic subnet declaration.
> -
> -subnet 10.254.239.0 netmask 255.255.255.224 {
> -  range 10.254.239.10 10.254.239.20;
> -  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
> -}
> -
> -# This declaration allows BOOTP clients to get dynamic addresses,
> -# which we don't really recommend.
> -
> -subnet 10.254.239.32 netmask 255.255.255.224 {
> -  range dynamic-bootp 10.254.239.40 10.254.239.60;
> -  option broadcast-address 10.254.239.31;
> -  option routers rtr-239-32-1.example.org;
> -}
> -
> -# A slightly different configuration for an internal subnet.
> -subnet 10.5.5.0 netmask 255.255.255.224 {
> -  range 10.5.5.26 10.5.5.30;
> -  option domain-name-servers ns1.internal.example.org;
> -  option domain-name "internal.example.org";
> -  option routers 10.5.5.1;
> -  option broadcast-address 10.5.5.31;
> -  default-lease-time 600;
> -  max-lease-time 7200;
> -}
> -
> -# Hosts which require special configuration options can be listed in
> -# host statements.   If no address is specified, the address will be
> -# allocated dynamically (if possible), but the host-specific information
> -# will still come from the host declaration.
> -
> -host passacaglia {
> -  hardware ethernet 0:0:c0:5d:bd:95;
> -  filename "vmunix.passacaglia";
> -  server-name "toccata.fugue.com";
> -}
> -
> -# Fixed IP addresses can also be specified for hosts.   These addresses
> -# should not also be listed as being available for dynamic assignment.
> -# Hosts for which fixed IP addresses have been specified can boot using
> -# BOOTP or DHCP.   Hosts for which no fixed address is specified can only
> -# be booted with DHCP, unless there is an address range on the subnet
> -# to which a BOOTP client is connected which has the dynamic-bootp flag
> -# set.
> -host fantasia {
> -  hardware ethernet 08:00:07:26:c0:a5;
> -  fixed-address fantasia.fugue.com;
> -}
> -
> -# You can declare a class of clients and then do address allocation
> -# based on that.   The example below shows a case where all clients
> -# in a certain class get addresses on the 10.17.224/24 subnet, and all
> -# other clients get addresses on the 10.0.29/24 subnet.
> -
> -class "foo" {
> -  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
> -}
> -
> -shared-network 224-29 {
> -  subnet 10.17.224.0 netmask 255.255.255.0 {
> -    option routers rtr-224.example.org;
> -  }
> -  subnet 10.0.29.0 netmask 255.255.255.0 {
> -    option routers rtr-29.example.org;
> -  }
> -  pool {
> -    allow members of "foo";
> -    range 10.17.224.10 10.17.224.250;
> -  }
> -  pool {
> -    deny members of "foo";
> -    range 10.0.29.10 10.0.29.230;
> -  }
> -}
> +## option definitions common to all supported networks...
> +#option domain-name "example.org";
> +#option domain-name-servers ns1.example.org, ns2.example.org;
> +#
> +#default-lease-time 600;
> +#max-lease-time 7200;
> +#
> +## Use this to enble / disable dynamic dns updates globally.
> +##ddns-update-style none;
> +#
> +## If this DHCP server is the official DHCP server for the local
> +## network, the authoritative directive should be uncommented.
> +##authoritative;
> +#
> +## Use this to send dhcp log messages to a different log file (you also
> +## have to hack syslog.conf to complete the redirection).
> +#log-facility local7;
> +#
> +## No service will be given on this subnet, but declaring it helps the
> +## DHCP server to understand the network topology.
> +#
> +#subnet 10.152.187.0 netmask 255.255.255.0 {
> +#}
> +#
> +## This is a very basic subnet declaration.
> +#
> +#subnet 10.254.239.0 netmask 255.255.255.224 {
> +#  range 10.254.239.10 10.254.239.20;
> +#  option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org;
> +#}
> +#
> +## This declaration allows BOOTP clients to get dynamic addresses,
> +## which we don't really recommend.
> +#
> +#subnet 10.254.239.32 netmask 255.255.255.224 {
> +#  range dynamic-bootp 10.254.239.40 10.254.239.60;
> +#  option broadcast-address 10.254.239.31;
> +#  option routers rtr-239-32-1.example.org;
> +#}
> +#
> +## A slightly different configuration for an internal subnet.
> +#subnet 10.5.5.0 netmask 255.255.255.224 {
> +#  range 10.5.5.26 10.5.5.30;
> +#  option domain-name-servers ns1.internal.example.org;
> +#  option domain-name "internal.example.org";
> +#  option routers 10.5.5.1;
> +#  option broadcast-address 10.5.5.31;
> +#  default-lease-time 600;
> +#  max-lease-time 7200;
> +#}
> +#
> +## Hosts which require special configuration options can be listed in
> +## host statements.   If no address is specified, the address will be
> +## allocated dynamically (if possible), but the host-specific information
> +## will still come from the host declaration.
> +#
> +#host passacaglia {
> +#  hardware ethernet 0:0:c0:5d:bd:95;
> +#  filename "vmunix.passacaglia";
> +#  server-name "toccata.example.com";
> +#}
> +#
> +## Fixed IP addresses can also be specified for hosts.   These addresses
> +## should not also be listed as being available for dynamic assignment.
> +## Hosts for which fixed IP addresses have been specified can boot using
> +## BOOTP or DHCP.   Hosts for which no fixed address is specified can only
> +## be booted with DHCP, unless there is an address range on the subnet
> +## to which a BOOTP client is connected which has the dynamic-bootp flag
> +## set.
> +#host fantasia {
> +#  hardware ethernet 08:00:07:26:c0:a5;
> +#  fixed-address fantasia.example.com;
> +#}
> +#
> +## You can declare a class of clients and then do address allocation
> +## based on that.   The example below shows a case where all clients
> +## in a certain class get addresses on the 10.17.224/24 subnet, and all
> +## other clients get addresses on the 10.0.29/24 subnet.
> +#
> +#class "foo" {
> +#  match if substring (option vendor-class-identifier, 0, 4) = "SUNW";
> +#}
> +#
> +#shared-network 224-29 {
> +#  subnet 10.17.224.0 netmask 255.255.255.0 {
> +#    option routers rtr-224.example.org;
> +#  }
> +#  subnet 10.0.29.0 netmask 255.255.255.0 {
> +#    option routers rtr-29.example.org;
> +#  }
> +#  pool {
> +#    allow members of "foo";
> +#    range 10.17.224.10 10.17.224.250;
> +#  }
> +#  pool {
> +#    deny members of "foo";
> +#    range 10.0.29.10 10.0.29.230;
> +#  }
> +#}

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] dhcp: warn in the menu if nothing is installed into the rootfs

[Michael Olbrich]

Thanks, applied as 479b314ca6d108a615ca87da5ac316d4921f8370.

Michael

[sent from post-receive hook]

On Tue, 29 Jun 2021 07:09:54 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20210620171046.25968-3-rhi@pengutronix.de>
> [mol: move it to the end and use INVISIBLE for menu level]
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dhcp.in b/rules/dhcp.in
> index 7eefb16c6414..7cbc8126b404 100644
> --- a/rules/dhcp.in
> +++ b/rules/dhcp.in
> @@ -53,3 +53,9 @@ config DHCP_RELAY
>  	  which the original request came.
>  
>  endif
> +
> +comment ""
> +	depends on INVISIBLE
> +
> +comment "Note: no DHCP binaries are currently selected"
> +	depends on DHCP && !DHCP_SERVER && !DHCP_CLIENT && !DHCP_RELAY

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de