From f9e50183b83141874629485f99c47d6466676e2d Mon Sep 17 00:00:00 2001
From: sunguoshuai <sunguoshuai@huawei.com>
Date: Wed, 25 Aug 2021 16:53:41 +0800
Subject: [PATCH] fix fcoe.service start error

(cherry picked from commit 8911d1b50ccadc9dbf4e161724d381c242b293bc)
---
 fcoe-utils.spec | 15 ++++++---------
 fcoe.config     |  5 -----
 fcoe.service    | 12 ------------
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 fcoe.config
 delete mode 100644 fcoe.service

diff --git a/fcoe-utils.spec b/fcoe-utils.spec
index d90e7b8..2df1f4d 100644
--- a/fcoe-utils.spec
+++ b/fcoe-utils.spec
@@ -1,13 +1,11 @@
 Name:               fcoe-utils
 Version:            1.0.33
-Release:            1
+Release:            2
 Summary:            Fibre Channel over Ethernet utilities
 License:            GPLv2
 URL:                https://github.com/morbidrsa/fcoe-utils
 Source0:            https://github.com/morbidrsa/fcoe-utils/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:            quickstart.txt
-Source2:            fcoe.service
-Source3:            fcoe.config
 Patch0:             backport-00-Revert_Make_gcc_compiler_happy_about_ifname_string.patch 
 Patch1:             backport-01-fix_VLAN_device_name_overflow_check.patch 
 Patch2:             backport-02-string_op_truncation_format_trauncation.patch     
@@ -38,15 +36,10 @@ cp -v %{SOURCE1} quickstart.txt
 %install
 %make_install
 rm -rf %{buildroot}/etc/init.d
-install -d %{buildroot}%{_sysconfdir}/sysconfig %{buildroot}%{_unitdir}
-rm -f %{buildroot}%{_unitdir}/*
-install -m 644 %{SOURCE2} %{buildroot}%{_unitdir}
-install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/sysconfig/fcoe
 install -d %{buildroot}%{_libexecdir}/fcoe
 for file in contrib/*.sh debug/*sh
     do install -m 755 ${file} %{buildroot}%{_libexecdir}/fcoe/
 done
-rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 
 %post
 %systemd_post fcoe.service
@@ -61,8 +54,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 %defattr(-,root,root)
 %doc COPYING
 %config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
-%config(noreplace) %{_sysconfdir}/sysconfig/fcoe
+%config(noreplace) %{_sysconfdir}/fcoe/config
 %{_unitdir}/fcoe.service
+%{_unitdir}/fcoemon.socket
 %{_sbindir}/*
 %{_datadir}/bash-completion/completions/*
 %{_libexecdir}/fcoe/
@@ -73,6 +67,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
 %{_mandir}/man8/*
 
 %changelog
+* Wed Aug 2021 sunguoshuai <sunguoshuai@huawei.com> - 1.0.33-2
+- Fix fcoe.service start error
+
 * Tue Mar 30 2021 lijingyuan <lijingyuan@huawei.com> - 1.0.33-1
 - Type:requirement
 - Id:NA
diff --git a/fcoe.config b/fcoe.config
deleted file mode 100644
index 2166c39..0000000
--- a/fcoe.config
+++ /dev/null
@@ -1,5 +0,0 @@
-# All supported drivers listed here are loaded when service starts
-SUPPORTED_DRIVERS="libfc fcoe bnx2fc"
-
-# Add --debug to enable debug messages
-FCOEMON_OPTS="--syslog"
diff --git a/fcoe.service b/fcoe.service
deleted file mode 100644
index 8c438c7..0000000
--- a/fcoe.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Open-FCoE Inititator.
-After=syslog.target network.target lldpad.service
-
-[Service]
-Type=forking
-EnvironmentFile=/etc/sysconfig/fcoe
-ExecStartPre=/sbin/modprobe -qa $SUPPORTED_DRIVERS
-ExecStart=/usr/sbin/fcoemon $FCOEMON_OPTS
-
-[Install]
-WantedBy=multi-user.target
-- 
Gitee