Hello community,
here is the log from the commit of package fcoe-utils for openSUSE:Factory
checked in at 2014-04-05 14:42:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fcoe-utils (Old)
and /work/SRC/openSUSE:Factory/.fcoe-utils.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcoe-utils"
Changes:
--------
--- /work/SRC/openSUSE:Factory/fcoe-utils/fcoe-utils.changes 2014-03-21
12:14:19.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.fcoe-utils.new/fcoe-utils.changes
2014-04-05 14:42:42.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Mar 21 14:49:35 CET 2014 - h...@suse.de
+
+- Fixup fcoemon.socket definitions (bnc#869392)
+ * Add patch 0025-systemctl-cannot-start-fcoemon.socket.patch
+- Remove mkinitrd support
+- Remove duplicate configuration file (bnc#869109)
+
+-------------------------------------------------------------------
Old:
----
mkinitrd-boot.sh
mkinitrd-setup.sh
New:
----
0025-systemctl-cannot-start-fcoemon.socket.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fcoe-utils.spec ++++++
--- /var/tmp/diff_new_pack.XvZsqL/_old 2014-04-05 14:42:43.000000000 +0200
+++ /var/tmp/diff_new_pack.XvZsqL/_new 2014-04-05 14:42:43.000000000 +0200
@@ -37,8 +37,6 @@
# git://open-fcoe.org/fcoe/fcoe-utils.git
Source0: %{name}-%{version}.tar.xz
Source2: fcoe.config
-Source20: mkinitrd-boot.sh
-Source22: mkinitrd-setup.sh
# Patches from git repository
Patch1: 0001-man-Fix-small-typo-regarding-fcf-option.patch
Patch2: 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch
@@ -66,6 +64,7 @@
Patch22: 0022-fcnsq-Fixup-64bit-integer-handling.patch
Patch23: 0023-fcoemon-add-systemd-service-file.patch
Patch24: 0024-fcoemon-systemd-socket-activation.patch
+Patch25: 0025-systemctl-cannot-start-fcoemon.socket.patch
# Patches from Fedora
Patch101: fcoe-utils-1.0.29-make.patch
@@ -102,6 +101,7 @@
%patch22 -p1
%patch23 -p1
%patch24 -p1
+%patch25 -p1
%patch101 -p1
%build
@@ -114,17 +114,11 @@
# old init script
rm -rf %{buildroot}/etc/init.d
-# mkinitrd script
-install -d ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/
-install -m 755 %{S:20} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/boot-fcoe.sh
-install -m 755 %{S:22} ${RPM_BUILD_ROOT}/lib/mkinitrd/scripts/setup-fcoe.sh
-
# unitfile
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcfcoe
# config
-mkdir -p %{buildroot}/var/adm/fillup-templates
-install -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.fcoe
+install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/fcoe/config
# contrib files
mkdir -p %{buildroot}%{_libexecdir}/fcoe
@@ -139,7 +133,6 @@
exit 0
%post
-[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
%service_add_post fcoe.service
%fillup_only -n fcoe
exit 0
@@ -149,7 +142,6 @@
exit 0
%postun
-[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
%service_del_preun fcoe.service
exit 0
@@ -164,8 +156,6 @@
%config(noreplace) %{_sysconfdir}/fcoe/config
%config(noreplace) %{_sysconfdir}/fcoe/cfg-ethx
%config %{_sysconfdir}/bash_completion.d/
-/var/adm/fillup-templates/sysconfig.fcoe
%{_libexecdir}/fcoe/
-/lib/mkinitrd
%changelog
++++++ 0025-systemctl-cannot-start-fcoemon.socket.patch ++++++
>From 913faf7761a8fb004d44b5515b14efb0f60e9fa9 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <h...@suse.de>
Date: Fri, 21 Mar 2014 14:46:40 +0100
Subject: systemctl cannot start fcoemon.socket
systemctl start fcoemon.socket fails, as systemd cannot find
the referenced service.
References: bnc#869392
Signed-off-by: Hannes Reinecke <h...@suse.de>
---
etc/systemd/fcoemon.socket | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/etc/systemd/fcoemon.socket b/etc/systemd/fcoemon.socket
index 4de8715..fdf7141 100644
--- a/etc/systemd/fcoemon.socket
+++ b/etc/systemd/fcoemon.socket
@@ -1,4 +1,8 @@
+[Unit]
+Description=Open-FCoE daemon control socket
+
[Socket]
+Service=fcoe.service
ListenDatagram=@/com/intel/fcoemon
PassCredentials=true
--
1.8.1.4
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
