From 636b4bf7b0730bc7dac0dc1cd8f3265b294bc2b2ae007676e3c6df5a2cc87210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 4 Aug 2014 09:12:41 +0000 Subject: [PATCH] Accepting request 242692 from home:hreinecke:branches:network:fcoe - Use correct socket name in fcoemon.socket (bnc#881205) * Add 0037-Use-correct-socket-for-fcoemon.socket.patch OBS-URL: https://build.opensuse.org/request/show/242692 OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=20 --- ...se-correct-socket-for-fcoemon.socket.patch | 31 +++++++++++++++++++ fcoe-utils.changes | 6 ++++ fcoe-utils.spec | 2 ++ 3 files changed, 39 insertions(+) create mode 100644 0037-Use-correct-socket-for-fcoemon.socket.patch diff --git a/0037-Use-correct-socket-for-fcoemon.socket.patch b/0037-Use-correct-socket-for-fcoemon.socket.patch new file mode 100644 index 0000000..0b7134f --- /dev/null +++ b/0037-Use-correct-socket-for-fcoemon.socket.patch @@ -0,0 +1,31 @@ +From 348489108793c83ec6ebbdba87888888219ca59d Mon Sep 17 00:00:00 2001 +From: Hannes Reinecke +Date: Mon, 28 Jul 2014 11:24:19 +0200 +Subject: Use correct socket for fcoemon.socket + +fcoeadm/fcoemon is using a socket 'fcm_clif', so we need to +refer to that one in fcoemon.socket. + +References: bnc#881205 + +Signed-off-by: Hannes Reinecke +--- + etc/systemd/fcoemon.socket | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/etc/systemd/fcoemon.socket b/etc/systemd/fcoemon.socket +index fdf7141..6768515 100644 +--- a/etc/systemd/fcoemon.socket ++++ b/etc/systemd/fcoemon.socket +@@ -3,7 +3,7 @@ Description=Open-FCoE daemon control socket + + [Socket] + Service=fcoe.service +-ListenDatagram=@/com/intel/fcoemon ++ListenDatagram=@fcm_clif + PassCredentials=true + + [Install] +-- +1.8.4.5 + diff --git a/fcoe-utils.changes b/fcoe-utils.changes index 5ce436e..a09fa2e 100644 --- a/fcoe-utils.changes +++ b/fcoe-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jul 28 11:28:12 CEST 2014 - hare@suse.de + +- Use correct socket name in fcoemon.socket (bnc#881205) + * Add 0037-Use-correct-socket-for-fcoemon.socket.patch + ------------------------------------------------------------------- Thu May 15 09:15:54 CEST 2014 - hare@suse.de diff --git a/fcoe-utils.spec b/fcoe-utils.spec index 5cc00e5..990ea61 100644 --- a/fcoe-utils.spec +++ b/fcoe-utils.spec @@ -76,6 +76,7 @@ Patch33: 0033-fipvlan-suppress-warning-interface-already-exists.patch Patch34: 0034-fipvlan-do-not-crash-on-empty-MAC-address-in-lookup_.patch Patch35: 0035-fipvlan-fixup-return-value-on-error.patch Patch36: 0036-fipvlan-clean-up-state-machine-for-pfd_add.patch +Patch37: 0037-Use-correct-socket-for-fcoemon.socket.patch # Patches from Fedora Patch101: fcoe-utils-1.0.29-make.patch @@ -124,6 +125,7 @@ connections. %patch34 -p1 %patch35 -p1 %patch36 -p1 +%patch37 -p1 %patch101 -p1 %build