diff options
author | akuster <akuster808@gmail.com> | 2020-09-01 08:22:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-02 16:00:46 +0100 |
commit | 8d7db36ecb19cb775ecc8d0522ded3e55b53c820 (patch) | |
tree | 24f55c645f353175b09f298933ce3d72b85a7fc1 /meta/recipes-connectivity/dhcp/files | |
parent | 6d60518854c5aab7f58bd9f010d8868d5820bb25 (diff) | |
download | poky-8d7db36ecb19cb775ecc8d0522ded3e55b53c820.tar.gz |
dhcp: remove from core
update maintainers.inc too
(From OE-Core rev: 7e3357892f204788162747e907d68f857118cf42)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/dhcp/files')
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/default-relay | 12 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/default-server | 7 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper | 39 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhclient.conf | 50 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhclient.service | 13 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcpd.conf | 108 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcpd.service | 15 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcpd6.service | 15 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/dhcrelay.service | 10 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/init-relay | 44 | ||||
-rw-r--r-- | meta/recipes-connectivity/dhcp/files/init-server | 44 |
11 files changed, 0 insertions, 357 deletions
diff --git a/meta/recipes-connectivity/dhcp/files/default-relay b/meta/recipes-connectivity/dhcp/files/default-relay deleted file mode 100644 index 7961f014be..0000000000 --- a/meta/recipes-connectivity/dhcp/files/default-relay +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | # Defaults for dhcp-relay initscript | ||
2 | # sourced by /etc/init.d/dhcp-relay | ||
3 | |||
4 | # What servers should the DHCP relay forward requests to? | ||
5 | # e.g: SERVERS="192.168.0.1" | ||
6 | SERVERS="" | ||
7 | |||
8 | # On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? | ||
9 | INTERFACES="" | ||
10 | |||
11 | # Additional options that are passed to the DHCP relay daemon? | ||
12 | OPTIONS="" | ||
diff --git a/meta/recipes-connectivity/dhcp/files/default-server b/meta/recipes-connectivity/dhcp/files/default-server deleted file mode 100644 index 0385d16992..0000000000 --- a/meta/recipes-connectivity/dhcp/files/default-server +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | # Defaults for dhcp initscript | ||
2 | # sourced by /etc/init.d/dhcp-server | ||
3 | # installed at /etc/default/dhcp-server by the maintainer scripts | ||
4 | |||
5 | # On what interfaces should the DHCP server (dhcpd) serve DHCP requests? | ||
6 | # Separate multiple interfaces with spaces, e.g. "eth0 eth1". | ||
7 | INTERFACES="" | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper b/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper deleted file mode 100644 index 7d0e224a1d..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhclient-systemd-wrapper +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | # In case the interface is used for nfs, skip it. | ||
4 | nfsroot=0 | ||
5 | interfaces="" | ||
6 | exec 9<&0 < /proc/mounts | ||
7 | while read dev mtpt fstype rest; do | ||
8 | if test $mtpt = "/" ; then | ||
9 | case $fstype in | ||
10 | nfs | nfs4) | ||
11 | nfsroot=1 | ||
12 | nfs_addr=`echo $rest | sed -e 's/^.*addr=\([0-9.]*\).*$/\1/'` | ||
13 | break | ||
14 | ;; | ||
15 | *) | ||
16 | ;; | ||
17 | esac | ||
18 | fi | ||
19 | done | ||
20 | exec 0<&9 9<&- | ||
21 | |||
22 | if [ $nfsroot -eq 0 ]; then | ||
23 | interfaces="$INTERFACES" | ||
24 | else | ||
25 | if [ -x /bin/ip -o -x /sbin/ip ] ; then | ||
26 | nfs_iface=`ip route get $nfs_addr | grep dev | sed -e 's/^.*dev \([-a-z0-9.]*\).*$/\1/'` | ||
27 | fi | ||
28 | for i in $INTERFACES; do | ||
29 | if test "x$i" = "x$nfs_iface"; then | ||
30 | echo "dhclient skipping nfsroot interface $i" | ||
31 | else | ||
32 | interfaces="$interfaces $i" | ||
33 | fi | ||
34 | done | ||
35 | fi | ||
36 | |||
37 | if test "x$interfaces" != "x"; then | ||
38 | /sbin/dhclient -d -cf /etc/dhcp/dhclient.conf -q -lf /var/lib/dhcp/dhclient.leases $interfaces | ||
39 | fi | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.conf b/meta/recipes-connectivity/dhcp/files/dhclient.conf deleted file mode 100644 index 0e6dcf96c2..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhclient.conf +++ /dev/null | |||
@@ -1,50 +0,0 @@ | |||
1 | # Configuration file for /sbin/dhclient, which is included in Debian's | ||
2 | # dhcp3-client package. | ||
3 | # | ||
4 | # This is a sample configuration file for dhclient. See dhclient.conf's | ||
5 | # man page for more information about the syntax of this file | ||
6 | # and a more comprehensive list of the parameters understood by | ||
7 | # dhclient. | ||
8 | # | ||
9 | # Normally, if the DHCP server provides reasonable information and does | ||
10 | # not leave anything out (like the domain name, for example), then | ||
11 | # few changes must be made to this file, if any. | ||
12 | # | ||
13 | |||
14 | #send host-name "andare.fugue.com"; | ||
15 | #send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; | ||
16 | #send dhcp-lease-time 3600; | ||
17 | #supersede domain-name "fugue.com home.vix.com"; | ||
18 | #prepend domain-name-servers 127.0.0.1; | ||
19 | request subnet-mask, broadcast-address, time-offset, routers, | ||
20 | domain-name, domain-name-servers, host-name, | ||
21 | netbios-name-servers, netbios-scope; | ||
22 | #require subnet-mask, domain-name-servers; | ||
23 | #timeout 60; | ||
24 | #retry 60; | ||
25 | #reboot 10; | ||
26 | #select-timeout 5; | ||
27 | #initial-interval 2; | ||
28 | #script "/etc/dhcp3/dhclient-script"; | ||
29 | #media "-link0 -link1 -link2", "link0 link1"; | ||
30 | #reject 192.33.137.209; | ||
31 | |||
32 | #alias { | ||
33 | # interface "eth0"; | ||
34 | # fixed-address 192.5.5.213; | ||
35 | # option subnet-mask 255.255.255.255; | ||
36 | #} | ||
37 | |||
38 | #lease { | ||
39 | # interface "eth0"; | ||
40 | # fixed-address 192.33.137.200; | ||
41 | # medium "link0 link1"; | ||
42 | # option host-name "andare.swiftmedia.com"; | ||
43 | # option subnet-mask 255.255.255.0; | ||
44 | # option broadcast-address 192.33.137.255; | ||
45 | # option routers 192.33.137.250; | ||
46 | # option domain-name-servers 127.0.0.1; | ||
47 | # renew 2 2000/1/12 00:00:01; | ||
48 | # rebind 2 2000/1/12 00:00:01; | ||
49 | # expire 2 2000/1/12 00:00:01; | ||
50 | #} | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhclient.service b/meta/recipes-connectivity/dhcp/files/dhclient.service deleted file mode 100644 index 9ddb4d1dfe..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhclient.service +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Dynamic Host Configuration Protocol (DHCP) | ||
3 | Wants=network.target | ||
4 | Before=network.target | ||
5 | After=systemd-udevd.service | ||
6 | |||
7 | [Service] | ||
8 | EnvironmentFile=-@SYSCONFDIR@/default/dhcp-client | ||
9 | ExecStart=@BASE_SBINDIR@/dhclient-systemd-wrapper | ||
10 | RemainAfterExit=yes | ||
11 | |||
12 | [Install] | ||
13 | WantedBy=multi-user.target | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.conf b/meta/recipes-connectivity/dhcp/files/dhcpd.conf deleted file mode 100644 index 0001c0f00e..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhcpd.conf +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | # | ||
2 | # Sample configuration file for ISC dhcpd for Debian | ||
3 | # | ||
4 | # $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $ | ||
5 | # | ||
6 | |||
7 | # The ddns-updates-style parameter controls whether or not the server will | ||
8 | # attempt to do a DNS update when a lease is confirmed. We default to the | ||
9 | # behavior of the version 2 packages ('none', since DHCP v2 didn't | ||
10 | # have support for DDNS.) | ||
11 | ddns-update-style none; | ||
12 | |||
13 | # option definitions common to all supported networks... | ||
14 | option domain-name "example.org"; | ||
15 | option domain-name-servers ns1.example.org, ns2.example.org; | ||
16 | |||
17 | default-lease-time 600; | ||
18 | max-lease-time 7200; | ||
19 | |||
20 | # If this DHCP server is the official DHCP server for the local | ||
21 | # network, the authoritative directive should be uncommented. | ||
22 | #authoritative; | ||
23 | |||
24 | # Use this to send dhcp log messages to a different log file (you also | ||
25 | # have to hack syslog.conf to complete the redirection). | ||
26 | log-facility local7; | ||
27 | |||
28 | # No service will be given on this subnet, but declaring it helps the | ||
29 | # DHCP server to understand the network topology. | ||
30 | |||
31 | #subnet 10.152.187.0 netmask 255.255.255.0 { | ||
32 | #} | ||
33 | |||
34 | # This is a very basic subnet declaration. | ||
35 | |||
36 | #subnet 10.254.239.0 netmask 255.255.255.224 { | ||
37 | # range 10.254.239.10 10.254.239.20; | ||
38 | # option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; | ||
39 | #} | ||
40 | |||
41 | # This declaration allows BOOTP clients to get dynamic addresses, | ||
42 | # which we don't really recommend. | ||
43 | |||
44 | #subnet 10.254.239.32 netmask 255.255.255.224 { | ||
45 | # range dynamic-bootp 10.254.239.40 10.254.239.60; | ||
46 | # option broadcast-address 10.254.239.31; | ||
47 | # option routers rtr-239-32-1.example.org; | ||
48 | #} | ||
49 | |||
50 | # A slightly different configuration for an internal subnet. | ||
51 | #subnet 10.5.5.0 netmask 255.255.255.224 { | ||
52 | # range 10.5.5.26 10.5.5.30; | ||
53 | # option domain-name-servers ns1.internal.example.org; | ||
54 | # option domain-name "internal.example.org"; | ||
55 | # option routers 10.5.5.1; | ||
56 | # option broadcast-address 10.5.5.31; | ||
57 | # default-lease-time 600; | ||
58 | # max-lease-time 7200; | ||
59 | #} | ||
60 | |||
61 | # Hosts which require special configuration options can be listed in | ||
62 | # host statements. If no address is specified, the address will be | ||
63 | # allocated dynamically (if possible), but the host-specific information | ||
64 | # will still come from the host declaration. | ||
65 | |||
66 | #host passacaglia { | ||
67 | # hardware ethernet 0:0:c0:5d:bd:95; | ||
68 | # filename "vmunix.passacaglia"; | ||
69 | # server-name "toccata.fugue.com"; | ||
70 | #} | ||
71 | |||
72 | # Fixed IP addresses can also be specified for hosts. These addresses | ||
73 | # should not also be listed as being available for dynamic assignment. | ||
74 | # Hosts for which fixed IP addresses have been specified can boot using | ||
75 | # BOOTP or DHCP. Hosts for which no fixed address is specified can only | ||
76 | # be booted with DHCP, unless there is an address range on the subnet | ||
77 | # to which a BOOTP client is connected which has the dynamic-bootp flag | ||
78 | # set. | ||
79 | #host fantasia { | ||
80 | # hardware ethernet 08:00:07:26:c0:a5; | ||
81 | # fixed-address fantasia.fugue.com; | ||
82 | #} | ||
83 | |||
84 | # You can declare a class of clients and then do address allocation | ||
85 | # based on that. The example below shows a case where all clients | ||
86 | # in a certain class get addresses on the 10.17.224/24 subnet, and all | ||
87 | # other clients get addresses on the 10.0.29/24 subnet. | ||
88 | |||
89 | #class "foo" { | ||
90 | # match if substring (option vendor-class-identifier, 0, 4) = "SUNW"; | ||
91 | #} | ||
92 | |||
93 | #shared-network 224-29 { | ||
94 | # subnet 10.17.224.0 netmask 255.255.255.0 { | ||
95 | # option routers rtr-224.example.org; | ||
96 | # } | ||
97 | # subnet 10.0.29.0 netmask 255.255.255.0 { | ||
98 | # option routers rtr-29.example.org; | ||
99 | # } | ||
100 | # pool { | ||
101 | # allow members of "foo"; | ||
102 | # range 10.17.224.10 10.17.224.250; | ||
103 | # } | ||
104 | # pool { | ||
105 | # deny members of "foo"; | ||
106 | # range 10.0.29.10 10.0.29.230; | ||
107 | # } | ||
108 | #} | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd.service b/meta/recipes-connectivity/dhcp/files/dhcpd.service deleted file mode 100644 index ae4f93eca5..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhcpd.service +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=DHCPv4 Server Daemon | ||
3 | Documentation=man:dhcpd(8) man:dhcpd.conf(5) | ||
4 | After=network.target | ||
5 | After=time-sync.target | ||
6 | |||
7 | [Service] | ||
8 | PIDFile=@localstatedir@/run/dhcpd.pid | ||
9 | EnvironmentFile=@SYSCONFDIR@/default/dhcp-server | ||
10 | EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcp-server | ||
11 | ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd.leases | ||
12 | ExecStart=@SBINDIR@/dhcpd -f -cf @SYSCONFDIR@/dhcp/dhcpd.conf -pf @localstatedir@/run/dhcpd.pid $DHCPDARGS -q $INTERFACES | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=multi-user.target | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhcpd6.service b/meta/recipes-connectivity/dhcp/files/dhcpd6.service deleted file mode 100644 index 52a6224dc2..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhcpd6.service +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=DHCPv6 Server Daemon | ||
3 | Documentation=man:dhcpd(8) man:dhcpd.conf(5) | ||
4 | After=network.target | ||
5 | After=time-sync.target | ||
6 | |||
7 | [Service] | ||
8 | PIDFile=@localstatedir@/run/dhcpd6.pid | ||
9 | EnvironmentFile=@SYSCONFDIR@/default/dhcp-server | ||
10 | EnvironmentFile=-@SYSCONFDIR@/sysconfig/dhcpd6 | ||
11 | ExecStartPre=@base_bindir@/touch @localstatedir@/lib/dhcp/dhcpd6.leases | ||
12 | ExecStart=@SBINDIR@/dhcpd -f -6 -cf @SYSCONFDIR@/dhcp/dhcpd6.conf -pf @localstatedir@/run/dhcpd6.pid $DHCPDARGS -q $INTERFACES | ||
13 | |||
14 | [Install] | ||
15 | WantedBy=multi-user.target | ||
diff --git a/meta/recipes-connectivity/dhcp/files/dhcrelay.service b/meta/recipes-connectivity/dhcp/files/dhcrelay.service deleted file mode 100644 index 15ff927d34..0000000000 --- a/meta/recipes-connectivity/dhcp/files/dhcrelay.service +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=DHCP Relay Agent Daemon | ||
3 | After=network.target | ||
4 | |||
5 | [Service] | ||
6 | EnvironmentFile=@SYSCONFDIR@/default/dhcp-relay | ||
7 | ExecStart=@SBINDIR@/dhcrelay -d --no-pid -q $SERVERS | ||
8 | |||
9 | [Install] | ||
10 | WantedBy=multi-user.target | ||
diff --git a/meta/recipes-connectivity/dhcp/files/init-relay b/meta/recipes-connectivity/dhcp/files/init-relay deleted file mode 100644 index 019a7e84cf..0000000000 --- a/meta/recipes-connectivity/dhcp/files/init-relay +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ | ||
4 | # | ||
5 | |||
6 | # It is not safe to start if we don't have a default configuration... | ||
7 | if [ ! -f /etc/default/dhcp-relay ]; then | ||
8 | echo "/etc/default/dhcp-relay does not exist! - Aborting..." | ||
9 | echo "create this file to fix the problem." | ||
10 | exit 1 | ||
11 | fi | ||
12 | |||
13 | # Read init script configuration (interfaces the daemon should listen on | ||
14 | # and the DHCP server we should forward requests to.) | ||
15 | . /etc/default/dhcp-relay | ||
16 | |||
17 | # Build command line for interfaces (will be passed to dhrelay below.) | ||
18 | IFCMD="" | ||
19 | if test "$INTERFACES" != ""; then | ||
20 | for I in $INTERFACES; do | ||
21 | IFCMD=${IFCMD}"-i "${I}" " | ||
22 | done | ||
23 | fi | ||
24 | |||
25 | DHCRELAYPID=/var/run/dhcrelay.pid | ||
26 | |||
27 | case "$1" in | ||
28 | start) | ||
29 | start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS | ||
30 | ;; | ||
31 | stop) | ||
32 | start-stop-daemon -K -x /usr/sbin/dhcrelay | ||
33 | ;; | ||
34 | restart | force-reload) | ||
35 | $0 stop | ||
36 | sleep 2 | ||
37 | $0 start | ||
38 | ;; | ||
39 | *) | ||
40 | echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" | ||
41 | exit 1 | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||
diff --git a/meta/recipes-connectivity/dhcp/files/init-server b/meta/recipes-connectivity/dhcp/files/init-server deleted file mode 100644 index 5e693adf78..0000000000 --- a/meta/recipes-connectivity/dhcp/files/init-server +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $ | ||
4 | # | ||
5 | |||
6 | test -f /usr/sbin/dhcpd || exit 0 | ||
7 | |||
8 | # It is not safe to start if we don't have a default configuration... | ||
9 | if [ ! -f /etc/default/dhcp-server ]; then | ||
10 | echo "/etc/default/dhcp-server does not exist! - Aborting..." | ||
11 | exit 0 | ||
12 | fi | ||
13 | |||
14 | # Read init script configuration (so far only interfaces the daemon | ||
15 | # should listen on.) | ||
16 | . /etc/default/dhcp-server | ||
17 | |||
18 | case "$1" in | ||
19 | start) | ||
20 | echo -n "Starting DHCP server: " | ||
21 | test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ | ||
22 | test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases | ||
23 | start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $INTERFACES -user dhcp -group dhcp | ||
24 | echo "." | ||
25 | ;; | ||
26 | stop) | ||
27 | echo -n "Stopping DHCP server: dhcpd3" | ||
28 | start-stop-daemon -K -x /usr/sbin/dhcpd | ||
29 | echo "." | ||
30 | ;; | ||
31 | restart | force-reload) | ||
32 | $0 stop | ||
33 | sleep 2 | ||
34 | $0 start | ||
35 | if [ "$?" != "0" ]; then | ||
36 | exit 1 | ||
37 | fi | ||
38 | ;; | ||
39 | *) | ||
40 | echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}" | ||
41 | exit 1 | ||
42 | esac | ||
43 | |||
44 | exit 0 | ||