mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Michael Olbrich <m.olbrich@pengutronix.de>
To: ptxdist@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: Re: [ptxdist] [APPLIED] dhcp: sync config files with upstream examples
Date: Tue, 29 Jun 2021 07:09:25 +0200	[thread overview]
Message-ID: <20210629050925.2524401-1-m.olbrich@pengutronix.de> (raw)
In-Reply-To: <20210620171046.25968-4-rhi@pengutronix.de>

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


  reply	other threads:[~2021-06-29  5:12 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-20 17:10 [ptxdist] [PATCH 1/4] dhcp: always install the config files Roland Hieber
2021-06-20 17:10 ` [ptxdist] [PATCH 2/4] dhcp: set reasonable default options Roland Hieber
2021-06-25  7:57   ` Michael Olbrich
2021-06-20 17:10 ` [ptxdist] [PATCH 3/4] dhcp: warn in the menu if nothing is installed into the rootfs Roland Hieber
2021-06-25  7:58   ` Michael Olbrich
2021-06-26 20:16     ` Roland Hieber
2021-06-28  6:22       ` Michael Olbrich
2021-06-29  5:09   ` [ptxdist] [APPLIED] " Michael Olbrich
2021-06-20 17:10 ` [ptxdist] [PATCH 4/4] dhcp: sync config files with upstream examples Roland Hieber
2021-06-29  5:09   ` Michael Olbrich [this message]
2021-06-29  5:09 ` [ptxdist] [APPLIED] dhcp: always install the config files Michael Olbrich

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210629050925.2524401-1-m.olbrich@pengutronix.de \
    --to=m.olbrich@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    --cc=rhi@pengutronix.de \
    --subject='Re: [ptxdist] [APPLIED] dhcp: sync config files with upstream examples' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox