diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2012-10-10 04:16:40 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-10-10 04:16:40 +0000 |
| commit | 4bcd8b3631109be30bc00255eef0cd11da50649a (patch) | |
| tree | abaea439251f58a3b546e32db891c8b339c8fc4a /net-misc/dhcp/files | |
| parent | missed a conditional, thanks to Arfrever for pointing out. minor style fixes (diff) | |
| download | gentoo-2-4bcd8b3631109be30bc00255eef0cd11da50649a.tar.gz gentoo-2-4bcd8b3631109be30bc00255eef0cd11da50649a.tar.bz2 gentoo-2-4bcd8b3631109be30bc00255eef0cd11da50649a.zip | |
Quiet ping output by default #296921 by Martin Mokrejš. Always accept the -4 option even when USE=-ipv6 #437108 by Stefan Reimer.
(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/dhcp/files')
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch | 29 | ||||
| -rw-r--r-- | net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch | 72 |
2 files changed, 101 insertions, 0 deletions
diff --git a/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch new file mode 100644 index 000000000000..6cec86c9d9c4 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.4-always-accept-4.patch @@ -0,0 +1,29 @@ +https://bugs.gentoo.org/437108 + +always accept the -4 option even if we don't have IPv6 support enabled. +the relay code does this already. + +--- a/client/dhclient.c ++++ b/client/dhclient.c +@@ -170,8 +170,8 @@ main(int argc, char **argv) { + if (!strcmp(argv[i], "-r")) { + release_mode = 1; + no_daemon = 1; +-#ifdef DHCPv6 + } else if (!strcmp(argv[i], "-4")) { ++#ifdef DHCPv6 + if (local_family_set && local_family != AF_INET) + log_fatal("Client can only do v4 or v6, not " + "both."); +--- a/server/dhcpd.c ++++ b/server/dhcpd.c +@@ -373,8 +373,8 @@ main(int argc, char **argv) { + } else if (!strcmp (argv [i], "-q")) { + quiet = 1; + quiet_interface_discovery = 1; +-#ifdef DHCPv6 + } else if (!strcmp(argv[i], "-4")) { ++#ifdef DHCPv6 + if (local_family_set && (local_family != AF_INET)) { + log_fatal("Server cannot run in both IPv4 and " + "IPv6 mode at the same time."); diff --git a/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch new file mode 100644 index 000000000000..66a1fcd79461 --- /dev/null +++ b/net-misc/dhcp/files/dhcp-4.2.4-quieter-ping.patch @@ -0,0 +1,72 @@ +https://bugs.gentoo.org/296921 + +`ping -q` will still print out summary information. send that to /dev/null. + +patch by Martin Mokrejš + +--- a/client/scripts/bsdos ++++ b/client/scripts/bsdos +@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then + sleep 1 + if [ "$new_routers" != "" ]; then + set $new_routers +- if ping -q -c 1 -w 1 $1; then ++ if ping -q -c 1 -w 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg +--- a/client/scripts/freebsd ++++ b/client/scripts/freebsd +@@ -284,7 +284,7 @@ if [ x$reason = xTIMEOUT ]; then + if [ -n "$new_routers" ]; then + $LOGGER "New Routers: $new_routers" + set -- $new_routers +- if ping -q -c 1 $1; then ++ if ping -q -c 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg +--- a/client/scripts/linux ++++ b/client/scripts/linux +@@ -253,7 +253,7 @@ if [ x$reason = xTIMEOUT ]; then + ifconfig $interface inet $new_ip_address $new_subnet_arg \ + $new_broadcast_arg $mtu_arg + set $new_routers +- if ping -q -c 1 $1; then ++ if ping -q -c 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg +--- a/client/scripts/netbsd ++++ b/client/scripts/netbsd +@@ -251,7 +251,7 @@ if [ x$reason = xTIMEOUT ]; then + sleep 1 + if [ "$new_routers" != "" ]; then + set $new_routers +- if ping -q -c 1 -w 1 $1; then ++ if ping -q -c 1 -w 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg +--- a/client/scripts/openbsd ++++ b/client/scripts/openbsd +@@ -245,7 +245,7 @@ if [ x$reason = xTIMEOUT ]; then + sleep 1 + if [ "$new_routers" != "" ]; then + set $new_routers +- if ping -q -c 1 -w 1 $1; then ++ if ping -q -c 1 -w 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface inet alias $alias_ip_address $alias_subnet_arg +--- a/client/scripts/openwrt ++++ b/client/scripts/openwrt +@@ -186,7 +186,7 @@ if [ x$reason = xTIMEOUT ]; then + ifconfig $interface $new_ip_address $new_subnet_arg \ + $new_broadcast_arg $mtu_arg $metric_arg + set $new_routers +- if ping -q -c 1 $1; then ++ if ping -q -c 1 $1 >/dev/null; then + if [ x$new_ip_address != x$alias_ip_address ] && \ + [ x$alias_ip_address != x ]; then + ifconfig $interface:0 $alias_ip_address $alias_subnet_arg |