Thanks, applied as debaad719ce27a27408b059cff2c5cc26ff3da4f. Michael
[sent from post-receive hook] On Tue, 29 Jun 2021 07:09:25 +0200, Roland Hieber <[email protected]> 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 <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > 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 [email protected] To unsubscribe, send a mail with subject "unsubscribe" to [email protected]
