Skip to content

Commit

Permalink
Remove support for treecleaned net-misc/pump
Browse files Browse the repository at this point in the history
Bug: https://bugs.gentoo.org/694314
Closes: https://bugs.gentoo.org/921538
Signed-off-by: Matoro Mahri <matoro_gentoo@matoro.tk>
Closes: #51
Signed-off-by: Sam James <sam@gentoo.org>
  • Loading branch information
matoro authored and thesamesam committed Jan 7, 2024
1 parent 6b54da4 commit 7b1c09f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 71 deletions.
7 changes: 2 additions & 5 deletions doc/net.example.Linux.in
Expand Up @@ -493,11 +493,10 @@

#-----------------------------------------------------------------------------
# DHCP
# DHCP can be provided by dhclient, dhcpcd, pump or udhcpc.
# DHCP can be provided by dhclient, dhcpcd, or udhcpc.
#
# dhclient: emerge net-misc/dhcp
# dhcpcd: emerge net-misc/dhcpcd
# pump: emerge net-misc/pump
# udhcpc: emerge sys-apps/busybox

# If you have more than one DHCP client installed, you need to specify which
Expand All @@ -508,7 +507,6 @@
# - All clients send the current hostname to the DHCP server by default
# - dhcpcd does not daemonize when the lease time is infinite
# - udhcp-0.9.3-r3 and earlier do not support getting NTP servers
# - pump does not support getting NIS servers
# - DHCP tends to erase any existing device information - so add
# static addresses after dhcp if you need them
# - dhclient and udhcpc can set other resolv.conf options such as "option"
Expand All @@ -524,11 +522,10 @@
# default) to 10 seconds.
#dhcpcd_eth0="-t 10"

# dhclient, udhcpc and pump don't have many runtime options
# dhclient and udhcpc don't have many runtime options
# You can pass options to them in a similar manner to dhcpcd though
#dhclient_eth0="..."
#udhcpc_eth0="..."
#pump_eth0="..."

# GENERIC DHCP OPTIONS
# Set generic DHCP options like so
Expand Down
2 changes: 1 addition & 1 deletion net/Makefile
Expand Up @@ -12,7 +12,7 @@ INC-FreeBSD= iwconfig.sh
SRCS-Linux= iwconfig.sh.in udhcpc.sh.in
INC-Linux= adsl.sh apipa.sh arping.sh bonding.sh br2684ctl.sh bridge.sh \
ccwgroup.sh clip.sh ethtool.sh iproute2.sh ifplugd.sh ip6to4.sh \
ipppd.sh iwconfig.sh netplugd.sh pppd.sh pump.sh tuntap.sh udhcpc.sh \
ipppd.sh iwconfig.sh netplugd.sh pppd.sh tuntap.sh udhcpc.sh \
vlan.sh macvlan.sh ip6rd.sh firewalld.sh dummy.sh hsr.sh l2tp.sh \
iw.sh iwd.sh wireguard.sh veth.sh dhclientv6.sh qmi.sh

Expand Down
2 changes: 1 addition & 1 deletion net/dhclient.sh
Expand Up @@ -9,7 +9,7 @@ dhclient_depend()
provide dhcp

# We prefer dhclient over these
after udhcpc pump
after udhcpc
}

_config_vars="$_config_vars dhcp dhcpcd"
Expand Down
2 changes: 1 addition & 1 deletion net/dhcpcd.sh
Expand Up @@ -10,7 +10,7 @@ dhcpcd_depend()
provide dhcp

# We prefer dhcpcd over these
after udhcpc pump dhclient
after udhcpc dhclient
}

_config_vars="$_config_vars dhcp dhcpcd"
Expand Down
63 changes: 0 additions & 63 deletions net/pump.sh

This file was deleted.

0 comments on commit 7b1c09f

Please sign in to comment.