From e72a023cf0e95adbdc564ccb15b31e4f896ce0a7 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 15 Jan 2001 19:56:00 +0000
Subject: ip_always_defrag goes *poof*

---
 initscripts.spec | 6 +-----
 sysconfig.txt    | 5 +++--
 sysctl.conf      | 2 --
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index acff52d3..9432c08a 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -150,16 +150,12 @@ if [ -n "$FORWARD_IPV4" -a "$FORWARD_IPV4" != "no" -a "$FORWARD_IPV4" != "false"
 	echo "# added by initscripts install on `date`" >> /etc/sysctl.conf
 	echo "net.ipv4.ip_forward = 1" >> /etc/sysctl.conf
 fi
-if [ "$DEFRAG_IPV4" = "yes" -o "$DEFRAG_IPV4" = "true" ]; then
-	echo "# added by initscripts install on `date`" >> /etc/sysctl.conf
-	echo "net.ipv4.ip_always_defrag = 1" >> /etc/sysctl.conf
-fi
 
 newnet=`mktemp /etc/sysconfig/network.XXXXXX`
 if [ -n "$newnet" ]; then
   sed "s|FORWARD_IPV4.*|# FORWARD_IPV4 removed; see /etc/sysctl.conf|g" \
    /etc/sysconfig/network > $newnet
-  sed "s|DEFRAG_IPV4.*|# DEFRAG_IPV4 removed; see /etc/sysctl.conf|g" \
+  sed "s|DEFRAG_IPV4.*|# DEFRAG_IPV4 removed; obsolete in 2.4. kernel|g" \
    $newnet > /etc/sysconfig/network
   rm -f $newnet
 fi
diff --git a/sysconfig.txt b/sysconfig.txt
index 9e055206..8f877c32 100644
--- a/sysconfig.txt
+++ b/sysconfig.txt
@@ -127,8 +127,9 @@ Files in /etc/sysconfig
     DEFRAG_IPV4=yes|no
       Setting this to yes used to automatically defragment IPv4
       packets. This is a good idea for masquerading, and
-      a bad idea otherwise. This setting has been moved into
-      net.ipv4.ip_always_defrag setting in /etc/sysctl.conf.
+      a bad idea otherwise. This setting was moved into
+      net.ipv4.ip_always_defrag setting in /etc/sysctl.conf. It
+      is no longer valid for 2.4 kernels.
 
 /etc/sysconfig/static-routes:
 
diff --git a/sysctl.conf b/sysctl.conf
index 59a86d44..b6ce4d8e 100644
--- a/sysctl.conf
+++ b/sysctl.conf
@@ -2,7 +2,5 @@
 net.ipv4.ip_forward = 0
 # Enables source route verification
 net.ipv4.conf.all.rp_filter = 1
-# Disables automatic defragmentation (needed for masquerading, LVS)
-net.ipv4.ip_always_defrag = 0
 # Disables the magic-sysrq key
 kernel.sysrq = 0
-- 
cgit v1.2.1