aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2001-12-07 17:03:14 +0000
committerRobert Watson <rwatson@FreeBSD.org>2001-12-07 17:03:14 +0000
commit67b86547daa68169d208f733254b861d4a010cab (patch)
tree29398f5342416abd7e314eec77d5b92b4d157e79
parentc39a614e0d2bb7de7e9414f5937f75da4c18abae (diff)
downloadsrc-67b86547daa68169d208f733254b861d4a010cab.tar.gz
src-67b86547daa68169d208f733254b861d4a010cab.zip
o Update rc.network to reflect the recent change of default in the
kernel TCP timer code: rather than checking for tcp_keepalive being set to "YES", check for "NO" and turn off keepalives if the variable is set in that manner. o Note: eventually, it would make sense to remove this variable from rc.conf management, and instead rely on sysctl.conf. In fact, this is probably true of a number of rc.conf variables whose sole aim is to drive the setting of sysctls at boot time.
Notes
Notes: svn path=/head/; revision=87500
-rw-r--r--etc/network.subr6
-rw-r--r--etc/rc.d/netoptions6
-rw-r--r--etc/rc.d/network16
-rw-r--r--etc/rc.d/network26
-rw-r--r--etc/rc.d/network36
-rw-r--r--etc/rc.d/routing6
-rw-r--r--etc/rc.network6
7 files changed, 21 insertions, 21 deletions
diff --git a/etc/network.subr b/etc/network.subr
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac
diff --git a/etc/rc.network b/etc/rc.network
index 9422640fef5f..b9b67fef20d2 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -456,9 +456,9 @@ network_pass1() {
esac
case ${tcp_keepalive} in
- [Yy][Ee][Ss])
- echo -n ' TCP keepalive=YES'
- sysctl -w net.inet.tcp.always_keepalive=1 >/dev/null
+ [Nn][Oo])
+ echo -n ' TCP keepalive=NO'
+ sysctl -w net.inet.tcp.always_keepalive=0 >/dev/null
;;
esac