[initscripts/f21] ifdown-ipv6: reset addrgenmode to eui64 for device ifup: fix typo

[Lukáš Nykrýn]

commit 7ac5618bae1a6de3fb3f0aa1389ce7c70bddbc35
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Tue Dec 16 15:02:01 2014 +0100

    ifdown-ipv6: reset addrgenmode to eui64 for device
    ifup: fix typo

 ...pv6-reset-addrgenmode-to-eui64-for-device.patch |   24 +++++++++++++++++++
 0001-ifup-fix-typo.patch                           |   25 ++++++++++++++++++++
 initscripts.spec                                   |   10 +++++++-
 3 files changed, 58 insertions(+), 1 deletions(-)
---
diff --git a/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch b/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch
new file mode 100644
index 0000000..ae7ef6f
--- /dev/null
+++ b/0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch
@@ -0,0 +1,24 @@
+From 7e548d51df2b8df098bc7584ad75258ac7064509 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn at redhat.com>
+Date: Tue, 16 Dec 2014 14:12:36 +0100
+Subject: [PATCH] ifdown-ipv6: reset addrgenmode to eui64 for device
+
+---
+ sysconfig/network-scripts/ifdown-ipv6 | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sysconfig/network-scripts/ifdown-ipv6 b/sysconfig/network-scripts/ifdown-ipv6
+index 7bfcfb3..d2207b7 100755
+--- a/sysconfig/network-scripts/ifdown-ipv6
++++ b/sysconfig/network-scripts/ifdown-ipv6
+@@ -66,6 +66,7 @@ fi
+ /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.forwarding=0 >/dev/null 2>&1
+ /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_ra=0 >/dev/null 2>&1
+ /sbin/sysctl -e -w net.ipv6.conf.$SYSCTLDEVICE.accept_redirects=0 >/dev/null 2>&1
++/sbin/ip link set $DEVICE addrgenmode eui64 >/dev/null 2>&1
+ 
+ # Test status of tun6to4 device
+ ipv6_test_device_status tun6to4
+-- 
+1.8.3.1
+
diff --git a/0001-ifup-fix-typo.patch b/0001-ifup-fix-typo.patch
new file mode 100644
index 0000000..234c78e
--- /dev/null
+++ b/0001-ifup-fix-typo.patch
@@ -0,0 +1,25 @@
+From 2444fc5a4060e4f78059b1bff9fa37a10b6fd648 Mon Sep 17 00:00:00 2001
+From: Lukas Nykryn <lnykryn at redhat.com>
+Date: Tue, 16 Dec 2014 12:14:08 +0100
+Subject: [PATCH] ifup: fix typo
+
+---
+ sysconfig/network-scripts/ifup | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup
+index 911707e..bb58685 100755
+--- a/sysconfig/network-scripts/ifup
++++ b/sysconfig/network-scripts/ifup
+@@ -90,7 +90,7 @@ if [ "${VLAN}" = "yes" ] && [ "$ISALIAS" = "no" ] && [ -n $DEVICE ]; then
+         fi
+         MATCH='^vlan[0-9]{1,4}?'
+          if [[ "${DEVICE}" =~ $MATCH ]]; then
+-             VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//'):
++             VID=$(echo "${DEVICE}" | LC_ALL=C sed 's/^vlan0*//')
+              # PHYSDEV should be set in ifcfg-vlan* file
+              if test -z "$PHYSDEV"; then
+                 net_log $"PHYSDEV should be set for device ${DEVICE}"
+-- 
+1.8.3.1
+
diff --git a/initscripts.spec b/initscripts.spec
index 1d55d80..d1af583 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -3,7 +3,7 @@ Name: initscripts
 Version: 9.56.1
 License: GPLv2
 Group: System Environment/Base
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://fedorahosted.org/releases/i/n/initscripts/
 Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -37,6 +37,8 @@ Provides: /sbin/service
 Patch1: 0001-ifup-vlan-fix-typo.patch
 Patch2: 0001-adjust-LINKDELAY-when-STP-is-on.patch
 Patch3: 0001-improve_check_for_bond_master_in_install_bonding_dri.patch
+Patch4: 0001-ifdown-ipv6-reset-addrgenmode-to-eui64-for-device.patch
+Patch5: 0001-ifup-fix-typo.patch
 
 %description
 This package contains the script that activates and deactivates most
@@ -58,6 +60,8 @@ Currently, this consists of various memory checking code.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 make
@@ -196,6 +200,10 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Tue Dec 16 2014 Lukáš Nykrýn <lnykryn at redhat.com> - 9.56.1-6
+- ifdown-ipv6: reset addrgenmode to eui64 for device
+- ifup: fix typo
+
 * Mon Dec 08 2014 Lukáš Nykrýn <lnykryn at redhat.com> - 9.56.1-5
 - improve check for bond_master in install bonding driver