From 27cc9048ec24359693ea595ca6ed75d72f2bc4a7 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Wed, 6 Jun 2012 17:15:23 -0700 Subject: [PATCH] refresh --- meta | 7 +++---- patches/ibacm-script | 15 +++++---------- patches/refresh-temp | 29 ----------------------------- 3 files changed, 8 insertions(+), 43 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index a3e9d9c..0d2ed0d 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: e917f08d22db5c2490d46081accac7b1a03ac4af -Head: aa0e918486cab42456f62183821976d90a4a3c65 +Previous: cc4efe4d24b50f5d015f7d603f5934f2c9f3b52c +Head: 9bc86a68a5463bb32aa6e72d4a50f4c4b469130a Applied: - ibacm-script: 238cc2ece48c8c494912095a10ea3c5b9fc63f99 - refresh-temp: aa0e918486cab42456f62183821976d90a4a3c65 + ibacm-script: 9bc86a68a5463bb32aa6e72d4a50f4c4b469130a Unapplied: dev-name2ip: 8e00708e882239292492e13aa51c82042255933c dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a diff --git a/patches/ibacm-script b/patches/ibacm-script index 1209747..9274ee1 100644 --- a/patches/ibacm-script +++ b/patches/ibacm-script @@ -1,5 +1,5 @@ Bottom: 06764dc11f67f3be9812eb13647311940c17a4d5 -Top: a30a089ff4da0e7cde66fbdf5c40675593e9dad8 +Top: 1fa1aac0ae4a8fd31279da05ecba55ed6398d03c Author: Sean Hefty Date: 2012-06-06 16:10:22 -0700 @@ -9,22 +9,17 @@ ibacm: --- diff --git a/ibacm.init.in b/ibacm.init.in -index b4e807f..2e6f817 100644 +index b4e807f..bd2d1bd 100644 --- a/ibacm.init.in +++ b/ibacm.init.in -@@ -9,8 +9,13 @@ +@@ -9,8 +9,8 @@ # Provides: ibacm # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Required-Start: rdma $network -# Required-Stop: rdma $network -+%if 0%{?el6} -+%{# Required-Start: rdma $network} -+%{# Required-Stop: rdma $network} -+%else -+%{# Required-Start: openibd $network} -+%{# Required-Stop: openibd $network} -+%endif ++# Required-Start: @rdmascript@ $network ++# Required-Stop: @rdmascript@ $network # Should-Start: # Should-Stop: # Short-Description: Starts and stops the InfiniBand ACM service diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 6a10081..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,29 +0,0 @@ -Bottom: a30a089ff4da0e7cde66fbdf5c40675593e9dad8 -Top: 1fa1aac0ae4a8fd31279da05ecba55ed6398d03c -Author: Sean Hefty -Date: 2012-06-06 17:15:23 -0700 - -Refresh of ibacm-script - ---- - -diff --git a/ibacm.init.in b/ibacm.init.in -index 2e6f817..bd2d1bd 100644 ---- a/ibacm.init.in -+++ b/ibacm.init.in -@@ -9,13 +9,8 @@ - # Provides: ibacm - # Default-Start: 2 3 4 5 - # Default-Stop: 0 1 6 --%if 0%{?el6} --%{# Required-Start: rdma $network} --%{# Required-Stop: rdma $network} --%else --%{# Required-Start: openibd $network} --%{# Required-Stop: openibd $network} --%endif -+# Required-Start: @rdmascript@ $network -+# Required-Stop: @rdmascript@ $network - # Should-Start: - # Should-Stop: - # Short-Description: Starts and stops the InfiniBand ACM service -- 2.46.0