From 86f3998a207110ebfa28f47a84b6868ad28243c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
Date: Thu, 7 Nov 2013 11:53:09 +0900
Subject: [PATCH] Don't install the old configuration file alongside the new
 one

- Add bnx2fc to the SUPPORTED_DRIVERS for consistency with previous configuration
---
 fcoe-utils.spec | 8 +++++++-
 fcoe.config     | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index f26da09..610bc90 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -3,7 +3,7 @@
 
 Name:               fcoe-utils
 Version:            1.0.29
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            Fibre Channel over Ethernet utilities
 Group:              Applications/System
 License:            GPLv2
@@ -64,6 +64,8 @@ for file in \
     debug/*sh
     do install -m 755 ${file} %{buildroot}%{_libexecdir}/fcoe/
 done
+# We supply our own config for fcoe.service
+rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 
 %post
 %systemd_post fcoe.service
@@ -86,6 +88,10 @@ done
 %{_libexecdir}/fcoe/
 
 %changelog
+* Thu Nov 07 2013 Petr Šabata <contyk@redhat.com> - 1.0.29-2
+- Don't install the old configuration file alongside the new one
+- Add bnx2fc to the SUPPORTED_DRIVERS for consistency with previous configuration
+
 * Thu Aug 29 2013 Petr Šabata <contyk@redhat.com> - 1.0.29-1
 - 1.0.29 bump
 
diff --git a/fcoe.config b/fcoe.config
index 635a01b..2166c39 100644
--- a/fcoe.config
+++ b/fcoe.config
@@ -1,5 +1,5 @@
 # All supported drivers listed here are loaded when service starts
-SUPPORTED_DRIVERS="libfc fcoe"
+SUPPORTED_DRIVERS="libfc fcoe bnx2fc"
 
 # Add --debug to enable debug messages
 FCOEMON_OPTS="--syslog"