1.0.20 bump

This commit is contained in:
Petr Sabata 2011-07-07 16:48:53 +02:00
parent 5f9c39a839
commit e3ba57ff1d
4 changed files with 61 additions and 60 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ fcoe-utils-*.tar.gz
fcoe-utils-*.rpm fcoe-utils-*.rpm
/fcoe-utils-1.0.18.tar.bz2 /fcoe-utils-1.0.18.tar.bz2
/fcoe-utils-1.0.19.tar.bz2 /fcoe-utils-1.0.19.tar.bz2
/fcoe-utils-1.0.20.tar.bz2

View File

@ -1,5 +1,7 @@
--- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-01-15 01:28:10.000000000 +0100 diff --git a/etc/initd/initd.fedora b/etc/initd/initd.fedora
+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 10:54:50.152483041 +0100 index 5c84e25..f3f3d91 100755
--- a/etc/initd/initd.fedora
+++ b/etc/initd/initd.fedora
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
# this program; if not, write to the Free Software Foundation, Inc., # this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
@ -18,9 +20,7 @@
# Default-Stop: # Default-Stop:
# Short-Description: Open-FCoE Initiator # Short-Description: Open-FCoE Initiator
# Description: Open-FCoE Initiator # Description: Open-FCoE Initiator
--- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-02-04 11:06:42.251483139 +0100 @@ -63,6 +63,16 @@ test -x $FCOEMON || {
+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 11:35:26.779482986 +0100
@@ -63,6 +63,16 @@
fi fi
} }
@ -37,51 +37,7 @@
start() start()
{ {
echo -n $"Starting FCoE initiator service: " echo -n $"Starting FCoE initiator service: "
@@ -80,22 +90,27 @@ @@ -75,26 +85,59 @@ start()
stop()
{
- local force=$1
-
- pid=$(pidof "$FCOEMON")
- if [ "$force" == "force" ]
- then
- action "Destroying any active fcoe interface/s"
- [ "$pid" ] && kill -HUP $pid
+ if have_fcoe_root; then
+ echo $"Possible FCoE root detected, not stopping FCoE."
+ exit 1
else
- [ "$pid" ] && kill -TERM $pid
- fi
+ local force=$1
- action $"Stopping FCoE initiator service: "
-
- rm -f /var/run/fcoemon.*
- rm -f /tmp/fcoemon.dcbd.*
- rm -f /var/lock/subsys/fcoe
+ pid=$(pidof "$FCOEMON")
+ if [ "$force" == "force" ]
+ then
+ action "Destroying any active fcoe interface/s"
+ [ "$pid" ] && kill -HUP $pid
+ else
+ [ "$pid" ] && kill -TERM $pid
+ fi
+
+ action $"Stopping FCoE initiator service: "
+
+ rm -f /var/run/fcoemon.*
+ rm -f /tmp/fcoemon.dcbd.*
+ rm -f /var/lock/subsys/fcoe
+ fi
}
status()
--- fcoe-utils-1.0.17/etc/initd/initd.fedora 2011-02-04 11:52:53.990483140 +0100
+++ fcoe-utils-1.0.17/etc/initd/initd.fedora.new 2011-02-04 12:46:03.401482934 +0100
@@ -85,6 +85,34 @@
echo echo
touch /var/lock/subsys/fcoe touch /var/lock/subsys/fcoe
@ -116,3 +72,40 @@
echo echo
} }
stop()
{
- local force=$1
-
- pid=$(pidof "$FCOEMON")
- if [ "$force" == "force" ]
- then
- action "Destroying any active fcoe interface/s"
- [ "$pid" ] && kill -HUP $pid
+ if have_fcoe_root; then
+ echo $"Possible FCoE root detected, not stopping FCoE."
+ exit 1
else
- [ "$pid" ] && kill -TERM $pid
- fi
+ local force=$1
+
+ pid=$(pidof "$FCOEMON")
+ if [ "$force" == "force" ]
+ then
+ action "Destroying any active fcoe interface/s"
+ [ "$pid" ] && kill -HUP $pid
+ else
+ [ "$pid" ] && kill -TERM $pid
+ fi
- action $"Stopping FCoE initiator service: "
+ action $"Stopping FCoE initiator service: "
- rm -f ${PID_FILE}
- rm -f /var/lock/subsys/fcoe
+ rm -f ${PID_FILE}
+ rm -f /var/lock/subsys/fcoe
+ fi
}
status()

View File

@ -1,5 +1,5 @@
Name: fcoe-utils Name: fcoe-utils
Version: 1.0.19 Version: 1.0.20
Release: 1%{?dist} Release: 1%{?dist}
Summary: Fibre Channel over Ethernet utilities Summary: Fibre Channel over Ethernet utilities
Group: Applications/System Group: Applications/System
@ -9,14 +9,19 @@ URL: http://www.open-fcoe.org
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
Source1: quickstart.txt Source1: quickstart.txt
# Generic Fedora patches # Generic Fedora patches
Patch0: fcoe-utils-1.0.17-init.patch Patch0: fcoe-utils-1.0.20-init.patch
Patch1: fcoe-utils-1.0.19-make.patch Patch1: fcoe-utils-1.0.19-make.patch
Patch2: fcoe-utils-1.0.18-help.patch Patch2: fcoe-utils-1.0.18-help.patch
Patch3: fcoe-utils-1.0.18-config.patch Patch3: fcoe-utils-1.0.18-config.patch
BuildRequires: libhbaapi-devel lldpad-devel libnl-devel
BuildRequires: libtool automake autoconf BuildRequires: libtool automake autoconf
Requires: lldpad libhbalinux >= 1.0.9 iproute device-mapper-multipath BuildRequires: lldpad-devel >= 0.9.43
BuildRequires: libhbaapi-devel >= 1.0.12
BuildRequires: libnl-devel
Requires: lldpad >= 0.9.43
Requires: libhbalinux >= 1.0.12
Requires: iproute
Requires: device-mapper-multipath
Requires(post): chkconfig Requires(post): chkconfig
Requires(preun): chkconfig initscripts Requires(preun): chkconfig initscripts
Requires(postun): initscripts Requires(postun): initscripts
@ -28,7 +33,6 @@ fcoemon - service to configure DCB Ethernet QOS filters, works with dcbd or lldp
%prep %prep
%setup -q %setup -q
# Fedora patches on top of that...
%patch0 -p1 -b .init %patch0 -p1 -b .init
%patch1 -p1 -b .make %patch1 -p1 -b .make
%patch2 -p1 -b .help %patch2 -p1 -b .help
@ -101,6 +105,9 @@ fi
%changelog %changelog
* Thu Jul 07 2011 Petr Sabata <contyk@redhat.com> - 1.0.20-1
- 1.0.20 bump
* Thu Jun 02 2011 Petr Sabata <contyk@redhat.com> - 1.0.19-1 * Thu Jun 02 2011 Petr Sabata <contyk@redhat.com> - 1.0.19-1
- 1.0.19 bump - 1.0.19 bump

View File

@ -1 +1 @@
bc1cf6400e442cc906026e4dffa39e55 fcoe-utils-1.0.19.tar.bz2 d23061aa7e353c5df14cc2429314117b fcoe-utils-1.0.20.tar.bz2