From 49fe1b68c9c90ecd20e9515850445548f5e67031 Mon Sep 17 00:00:00 2001 From: Darryl L. Pierce Date: Nov 12 2012 17:58:30 +0000 Subject: Changed qpidd.service to not start until after networking. --- diff --git a/06-Changed-systemd-support-to-requiring-Networking-star.patch b/06-Changed-systemd-support-to-requiring-Networking-star.patch new file mode 100644 index 0000000..728c83a --- /dev/null +++ b/06-Changed-systemd-support-to-requiring-Networking-star.patch @@ -0,0 +1,29 @@ +From 976f28f7be80c1ea9f09b74a6213f612ab015918 Mon Sep 17 00:00:00 2001 +From: mcpierce +Date: Mon, 12 Nov 2012 16:38:14 +0000 +Subject: [PATCH] Changed systemd support to requiring Networking start first. + +Before the qpidd service was started in parallel to networking. Now it's +started after networking is started. + +git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1408346 13f79535-47bb-0310-9956-ffa450edef68 +--- + qpid/cpp/etc/qpidd.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qpid/cpp/etc/qpidd.service.in b/qpid/cpp/etc/qpidd.service.in +index ec89e12..a654983 100644 +--- a/qpid/cpp/etc/qpidd.service.in ++++ b/qpid/cpp/etc/qpidd.service.in +@@ -1,7 +1,7 @@ + [Unit] + Description=An AMQP message broker daemon. + Documentation=man:qpidd(1) http://qpid.apache.org/ +-After=network.target ++Requires=network.target + + [Service] + User=qpidd +-- +1.7.11.7 + diff --git a/qpid-cpp.spec b/qpid-cpp.spec index d16a45f..60f4ce9 100644 --- a/qpid-cpp.spec +++ b/qpid-cpp.spec @@ -30,7 +30,7 @@ Name: qpid-cpp Version: 0.18 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Libraries for Qpid C++ client applications License: ASL 2.0 URL: http://qpid.apache.org @@ -71,6 +71,7 @@ Patch2: 02-Relocated-all-swig-.i-files-to-the-include-directory.patch Patch3: 03-Provides-systemd-support-to-qpidd.patch Patch4: 04-Fix-building-of-messaging-examples-after-installatio.patch Patch5: 05-Install-CMake-file-for-C-messaging-example.patch +Patch6: 06-Changed-systemd-support-to-requiring-Networking-star.patch %description @@ -576,6 +577,7 @@ Management and diagnostic tools for Apache Qpid brokers and clients. %patch3 -p2 %patch4 -p2 %patch5 -p2 +%patch6 -p2 %global perftests "qpid-perftest qpid-topic-listener qpid-topic-publisher qpid-latency-test qpid-client-test qpid-txtest" @@ -763,6 +765,8 @@ rm -rf %{buildroot} %changelog +* Mon Nov 12 2012 Darryl L. Pierce - 0.18-6 +- Changed qpidd.service to not start until after networking. * Tue Oct 16 2012 Darryl L. Pierce - 0.18-5 - Install CMake file for C++ messaging examples.