From 031a9ddaf6e25fb92959d5c1d7198a69c6ea6fbd Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 6 Aug 2012 15:19:11 -0400
Subject: Drop net.hotplug

---
 Makefile                              |  1 -
 initscripts.spec                      |  1 -
 sysconfig/network-scripts/net.hotplug | 60 -----------------------------------
 udev/rules.d/60-net.rules             |  1 -
 4 files changed, 63 deletions(-)
 delete mode 100755 sysconfig/network-scripts/net.hotplug

diff --git a/Makefile b/Makefile
index 89706260..17313e21 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,6 @@ install:
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifup-*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/ifdown-*
 	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/init*
-	chmod 755 $(ROOT)/etc/sysconfig/network-scripts/net.hotplug
 	chmod 755 $(ROOT)/etc/NetworkManager/dispatcher.d/00-netreport
 	mkdir -p $(ROOT)/etc/sysconfig/modules
 	mkdir -p $(ROOT)/etc/sysconfig/networking/devices
diff --git a/initscripts.spec b/initscripts.spec
index d7bf08a3..a9f9d8b6 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -155,7 +155,6 @@ rm -rf $RPM_BUILD_ROOT
 /etc/sysconfig/network-scripts/ifup-wireless
 /etc/sysconfig/network-scripts/ifup-isdn
 /etc/sysconfig/network-scripts/ifdown-isdn
-/etc/sysconfig/network-scripts/net.hotplug
 %ifarch s390 s390x
 /etc/sysconfig/network-scripts/ifup-ctc
 %endif
diff --git a/sysconfig/network-scripts/net.hotplug b/sysconfig/network-scripts/net.hotplug
deleted file mode 100755
index b10131d1..00000000
--- a/sysconfig/network-scripts/net.hotplug
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-
-# Don't do anything if the network is stopped
-if [ ! -f /var/lock/subsys/network ]; then
-    exit 0
-fi
-if [ -f /dev/.in_sysinit ] ; then
-    exit 0
-fi
-
-. /etc/sysconfig/network-scripts/network-functions
-
-if [ "$INTERFACE" = "" ]; then
-    exit 1
-fi
-
-[ "$(cat /sys/class/net/$INTERFACE/type)" != "1" ] && exit 0
-
-case $ACTION in
-add|register)
-    
-    case $INTERFACE in
-	# interfaces that are brought up as a part of configuration
-	ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*)
-	    exit 0
-	    ;;
-	# interfaces that are registered then brought up
-	*)
-	    export IN_HOTPLUG=1
-	    if [ -x /sbin/ifup ]; then
-	        addr=$(get_hwaddr ${INTERFACE})
-		if [ -n "$addr" ]; then
-			nconfig=$(get_config_by_hwaddr ${addr})
-			[ -n "$nconfig" ] && INTERFACE=$nconfig
-		fi
-		exec /sbin/ifup $INTERFACE
-	    fi	
-	    ;;
-    esac
-    ;;
-
-remove|unregister)
-    case $INTERFACE in
-	# interfaces that are brought down as part of deconfiguration
-	ppp*|ippp*|isdn*|plip*|lo*|irda*|dummy*|ipsec*|tun*|tap*)
-	    exit 0
-	    ;;
-	*)
-	    export IN_HOTPLUG=1
-	    if [ -x /sbin/ifdown ]; then
-		exec /sbin/ifdown $INTERFACE
-	    fi
-	    ;;
-    esac
-    ;;
-
-*)
-    exit 1 ;;
-
-esac
diff --git a/udev/rules.d/60-net.rules b/udev/rules.d/60-net.rules
index 718ad5d9..0e0507a1 100644
--- a/udev/rules.d/60-net.rules
+++ b/udev/rules.d/60-net.rules
@@ -1,2 +1 @@
 ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/rename_device", RESULT=="?*", ENV{INTERFACE_NAME}="$result"
-SUBSYSTEM=="net", RUN+="/etc/sysconfig/network-scripts/net.hotplug"
-- 
cgit v1.2.1