refresh

diff --git a/meta b/meta
index 4fe6a1a556a815c28094cf3a14506592d29324d7..2acb84bacca098f6e3fa842530f635b8b1be2105 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 645464fe32c9df1b14754829743e81e430bd9ea5
-Head: 0577a43d8764beb9d75fc4c9be421e6ef382efc1
+Previous: 019fc261357171e539d01bb61f5851542b440be5
+Head: 238cc2ece48c8c494912095a10ea3c5b9fc63f99
 Applied:
-  ibacm-script: fdeb5c745b86ef5e09cb7f2d84761cb5793443aa
-  refresh-temp: 0577a43d8764beb9d75fc4c9be421e6ef382efc1
+  ibacm-script: 238cc2ece48c8c494912095a10ea3c5b9fc63f99
 Unapplied:
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
   dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a

diff --git a/patches/ibacm-script b/patches/ibacm-script
index 49c4270412ac4b826730c375d7a0174f2e357a67..120974714b97014da980ddab9a71a5a3810df832 100644 (file)
--- a/patches/ibacm-script
+++ b/patches/ibacm-script
@@ -1,5 +1,5 @@
 Bottom: 06764dc11f67f3be9812eb13647311940c17a4d5
-Top:    06764dc11f67f3be9812eb13647311940c17a4d5
+Top:    a30a089ff4da0e7cde66fbdf5c40675593e9dad8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-06-06 16:10:22 -0700
 
@@ -8,4 +8,23 @@ ibacm:
 
 ---
 
-
+diff --git a/ibacm.init.in b/ibacm.init.in
+index b4e807f..2e6f817 100644
+--- a/ibacm.init.in
++++ b/ibacm.init.in
+@@ -9,8 +9,13 @@
+ # 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
+ # 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 (file)
index f40fec5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,29 +0,0 @@
-Bottom: 06764dc11f67f3be9812eb13647311940c17a4d5
-Top:    a30a089ff4da0e7cde66fbdf5c40675593e9dad8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-06-06 16:40:51 -0700
-
-Refresh of ibacm-script
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index b4e807f..2e6f817 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -9,8 +9,13 @@
- # 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
- # Should-Start:
- # Should-Stop:
- # Short-Description: Starts and stops the InfiniBand ACM service