From 5e2ed679cd3eb2aa3d6bd1cf9907f7736ac78434 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 22 Jun 2007 22:08:30 +0000
Subject: - init.d/network, network-functions: don't fiddle with hotplug
 settings (#185569, #209307)

---
 initscripts.spec                            | 1 +
 rc.d/init.d/network                         | 6 ------
 sysconfig/network-scripts/network-functions | 8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/initscripts.spec b/initscripts.spec
index 5afb4c10..2f29abe5 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -207,6 +207,7 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %attr(0664,root,utmp) /var/run/utmp
 
 %changelog
+- init.d/network, network-functions: don't fiddle with hotplug settings (#185569, #209307)
 - init.d/network: add support for VLAN_PLUS_VID_NO_PAD vlans (#222975)
 
 * Mon Feb 12 2007 Miloslav Trmac <mitr@redhat.com> - 7.93.29.EL-1
diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index 89b82381..75db3646 100755
--- a/rc.d/init.d/network
+++ b/rc.d/init.d/network
@@ -85,10 +85,6 @@ case "$1" in
 	    ;;
 	esac
 
-	oldhotplug=`sysctl kernel.hotplug  2>/dev/null | \
-	    awk '{ print $3 }' 2>/dev/null`
-	sysctl -w kernel.hotplug="/etc/hotplug/firmware.agent" > /dev/null 2>&1
-
 	vlaninterfaces=""
 	cipeinterfaces=""
 	xdslinterfaces=""
@@ -158,8 +154,6 @@ case "$1" in
 	    fi
         done
 
-	sysctl -w kernel.hotplug=$oldhotplug > /dev/null 2>&1
-	
 	# Add non interface-specific static-routes.
 	if [ -f /etc/sysconfig/static-routes ]; then
 	   grep "^any" /etc/sysconfig/static-routes | while read ignore args ; do
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index b8ba825c..640f010e 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -184,13 +184,7 @@ is_available ()
     if [ -z "$alias" -o "$alias" = "off" -o "$alias" = "/bin/true" ]; then
         return 2
     fi
-    HOTPLUG=`cat /proc/sys/kernel/hotplug`
-    echo "/etc/hotplug/firmware.agent" > /proc/sys/kernel/hotplug
-    modprobe $1 > /dev/null 2>&1 || {
-      echo "$HOTPLUG" > /proc/sys/kernel/hotplug
-      return 1
-    }
-    echo "$HOTPLUG"  > /proc/sys/kernel/hotplug
+    modprobe $1 > /dev/null 2>&1 || return 1
     # if it is a mainframe ccwgroup device, configure it before
     # trying to rename it:
     need_config ${1}
-- 
cgit