From e182e58e886c6e5cb105055b76646113f2c3bc2d Mon Sep 17 00:00:00 2001
From: Lukas Nykryn <lnykryn@redhat.com>
Date: Mon, 8 Oct 2012 12:47:23 +0200
Subject: Revert patches which should not be in 6.4

Revert "Process rule6-* for sit devices (#840009)"

This reverts commit f082f9e64eadbf68ef9bb67744c97c0974af9115.

Revert "securetty: check if the device is in the file before attempting to write to it"

This reverts commit 10c72ce532c1d4f6d0b17fdc9448c9bd2d0b5ef5.

Revert "Killproc -d should parse same values as sleep"

This reverts commit 763b7dcf6bf9e47d90546be1aabf1f724dd527f8.

Revert "Make killproc more granular when delay is passed. (#428029, <xjakub@fi.muni.cz>)"

This reverts commit 6e62c51f3162081cc05ef546929aa98b8448b1cb.

Revert "Allow dhclient configuration files for DHCPv6 as well. (#815676)"

This reverts commit 9987361e94ec6f26e557053b27af6e43a9ee13e1.
---
 sysconfig/network-scripts/ifdown-sit        |  3 ---
 sysconfig/network-scripts/ifup-eth          | 13 ++++++++++---
 sysconfig/network-scripts/ifup-sit          |  8 ++++++--
 sysconfig/network-scripts/network-functions | 11 -----------
 4 files changed, 16 insertions(+), 19 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifdown-sit b/sysconfig/network-scripts/ifdown-sit
index 7d6951f2..68b2002f 100755
--- a/sysconfig/network-scripts/ifdown-sit
+++ b/sysconfig/network-scripts/ifdown-sit
@@ -51,8 +51,5 @@ if [ $? != 0 -a $? != 11 ]; then
 	exit 0
 fi
 
-# Cleanup additional static routes
-/etc/sysconfig/network-scripts/ifdown-routes ${REALDEVICE}
-
 # Cleanup and shut down IPv6-in-IPv4 tunnel device
 ipv6_del_tunnel_device $DEVICE
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index ea9de5f6..d3adb143 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -176,7 +176,15 @@ if [ -n "${DYNCONFIG}" -a -x /sbin/dhclient ]; then
     else
        ONESHOT="-1";
     fi;
-    generate_config_file_name
+    # allow users to use generic '/etc/dhclient.conf' (as documented in manpage!) 
+    # if per-device file doesn't exist or is empty
+    if [ -s /etc/dhcp/dhclient-${DEVICE}.conf ]; then
+       DHCLIENTCONF="-cf /etc/dhcp/dhclient-${DEVICE}.conf";
+    elif [ -s /etc/dhclient-${DEVICE}.conf ]; then
+       DHCLIENTCONF="-cf /etc/dhclient-${DEVICE}.conf";
+    else
+       DHCLIENTCONF='';
+    fi;
     # copy any lease obtained by the initrd
     for file in /dev/.dhclient-${DEVICE}.leases /dev/.initramfs/net.${DEVICE}.lease ; do
         if [ -f "${file}" ]; then
@@ -291,8 +299,7 @@ fi
 # IPv6 initialisation?
 /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG}
 if [[ "${DHCPV6C}"  = [Yy1]* ]] && [ -x /sbin/dhclient ]; then
-    generate_config_file_name 6
-    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
+    /sbin/dhclient -6 -1 ${DHCPV6C_OPTIONS} -lf /var/lib/dhclient/dhclient6-${DEVICE}.leases -pf /var/run/dhclient6-${DEVICE}.pid ${DHCP_HOSTNAME:+-H $DHCP_HOSTNAME} ${DEVICE}
 fi
 
 exec /etc/sysconfig/network-scripts/ifup-post ${CONFIG} ${2}
diff --git a/sysconfig/network-scripts/ifup-sit b/sysconfig/network-scripts/ifup-sit
index 330118a8..3b24985c 100755
--- a/sysconfig/network-scripts/ifup-sit
+++ b/sysconfig/network-scripts/ifup-sit
@@ -104,5 +104,9 @@ if [ -f /etc/sysconfig/static-routes-ipv6 ]; then
 	done
 fi
 
-# Setup static routes
-/etc/sysconfig/network-scripts/ifup-routes ${REALDEVICE}
+# Setup additional static IPv6 routes (newer config style)
+if [ -f "/etc/sysconfig/network-scripts/route6-$REALDEVICE" ]; then
+	cat "/etc/sysconfig/network-scripts/route6-$REALDEVICE" | sed 's/#.*//g' | grep -v '^[[:space:]]*$' | while read line; do
+		/sbin/ip -6 route add $line
+	done
+fi
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index a3833463..e0d5018c 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -59,17 +59,6 @@ get_uuid_by_config ()
     dbus-send --system --print-reply --dest=com.redhat.ifcfgrh1 /com/redhat/ifcfgrh1 com.redhat.ifcfgrh1.GetIfcfgDetails string:"/etc/sysconfig/network-scripts/$1" 2>/dev/null | awk -F '"' '/string / { print $2 }'
 }
 
-generate_config_file_name () {
-	local ver=$1
-	if [ -s /etc/dhcp/dhclient$ver-${DEVICE}.conf ]; then
-		DHCLIENTCONF="-cf /etc/dhcp/dhclient$ver-${DEVICE}.conf";
-	elif [ -s /etc/dhclient$ver-${DEVICE}.conf ]; then
-		DHCLIENTCONF="-cf /etc/dhclient$ver-${DEVICE}.conf";
-	else
-		DHCLIENTCONF='';
-	fi
-}
-
 need_config ()
 {
     local nconfig
-- 
cgit v1.2.1