diff --git a/0001-install_bonding_driver-drop-check-for-existing-devic.patch b/0001-install_bonding_driver-drop-check-for-existing-devic.patch new file mode 100644 index 0000000..e20de07 --- /dev/null +++ b/0001-install_bonding_driver-drop-check-for-existing-devic.patch @@ -0,0 +1,27 @@ +From 7648a78fc9f973b111776ff8ddb32f5108f6a985 Mon Sep 17 00:00:00 2001 +From: Lukas Nykryn +Date: Mon, 5 Aug 2013 15:33:08 +0200 +Subject: [PATCH] install_bonding_driver: drop check for existing device + (#991335) + +Install_bonding_driver is now doing more that loading kernel driver, +so that check is not correct. +--- + sysconfig/network-scripts/network-functions | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions +index 1cb26d1..c699fc0 100644 +--- a/sysconfig/network-scripts/network-functions ++++ b/sysconfig/network-scripts/network-functions +@@ -428,7 +428,6 @@ is_wireless_device () + + install_bonding_driver () + { +- [ -d "/sys/class/net/$1" ] && return 0 + [ ! -f /sys/class/net/bonding_masters ] && ( modprobe bonding || return 1 ) + if ! grep -sq "$1" /sys/class/net/bonding_masters; then + echo "+$1" > /sys/class/net/bonding_masters 2>/dev/null +-- +1.8.3.1 + diff --git a/initscripts.spec b/initscripts.spec index 2fbd1ca..e49ded8 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.47 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist} +Release: 2%{?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 @@ -34,6 +34,8 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service +Patch1: 0001-install_bonding_driver-drop-check-for-existing-devic.patch + %description The initscripts package contains the basic system scripts used to boot your Red Hat or Fedora system, change runlevels, and shut the system down @@ -53,6 +55,7 @@ Currently, this consists of various memory checking code. %prep %setup -q +%patch1 -p1 %build make @@ -217,6 +220,9 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog +* Tue Oct 07 2014 Lukáš Nykrýn - 9.47-2 +- install_bonding_driver: drop check for existing device (#1082257) + * Fri May 31 2013 Lukáš Nykrýn - 9.47-1 - network-functions: to determine state of nscd check socket not lock (#960779) - sysconfig.txt advised saslauthd -a instad of -v