refresh

diff --git a/meta b/meta
index cb0e5ec58c3aba1527bd9f5ed771ec1cdb49d590..cc450590703691353f47d35bda4e2a05dd636e83 100644 (file)
--- a/meta
+++ b/meta
@@ -1,12 +1,11 @@
 Version: 1
-Previous: 40672cfcc35e52d81d9b9eee131c5a7d2235540d
-Head: 10bc452b131ffe771d383cf21f0880563cdbfd34
+Previous: 2dc0d38551abefe39a51489b2fb37bd8a211e818
+Head: 4d9833eaf6e6bf757d2ee65af814722ccba3b019
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
   file-loc: 19447bec1a6b2cae7f27654010530f95403c2239
-  init-script: 55398d2e8fcf6e88cb0e474137645775a7e65213
-  refresh-temp: 10bc452b131ffe771d383cf21f0880563cdbfd34
+  init-script: 4d9833eaf6e6bf757d2ee65af814722ccba3b019
 Unapplied:
   fixup-man: 299df9b474d21a5bf1f9aa103248198e4198eefd
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/init-script b/patches/init-script
index e30e4679739786d128f0b1251d825d95a723ecb2..4bf50bc932a8c5f23cfacf4cbf7ab336794b888c 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
 Bottom: f12645dfa0a12d7006a65beabc21e55ad5dd4037
-Top:    5147fa714d20dcc906e6eaf06c420b07199136ff
+Top:    5d9a7f42254544cdbaae0bfe0b6ec861066dba01
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 diff --git a/ibacm.init b/ibacm.init
 new file mode 100644
-index 0000000..14588a1
+index 0000000..8f863eb
 --- /dev/null
 +++ b/ibacm.init
 @@ -0,0 +1,100 @@
@@ -32,8 +32,8 @@ index 0000000..14588a1
 +# Default-Stop: 0 1 6
 +# Required-Start: rdma $network
 +# Required-Stop: rdma $network
-+# Should-Start: opensm
-+# Should-Stop: opensm
++# Should-Start:
++# Should-Stop:
 +# Short-Description: Starts and stops the InfiniBand ACM service
 +# Description: The InfiniBand ACM service provides a user space implementation
 +#     of someting resembling an ARP cache for InfiniBand SA queries and

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f61f225..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 5147fa714d20dcc906e6eaf06c420b07199136ff
-Top:    5d9a7f42254544cdbaae0bfe0b6ec861066dba01
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-30 11:48:58 -0700
-
-Refresh of init-script
-
----
-
-diff --git a/ibacm.init b/ibacm.init
-index 14588a1..8f863eb 100644
---- a/ibacm.init
-+++ b/ibacm.init
-@@ -11,8 +11,8 @@
- # Default-Stop: 0 1 6
- # Required-Start: rdma $network
- # Required-Stop: rdma $network
--# Should-Start: opensm
--# Should-Stop: opensm
-+# Should-Start:
-+# Should-Stop:
- # Short-Description: Starts and stops the InfiniBand ACM service
- # Description: The InfiniBand ACM service provides a user space implementation
- #     of someting resembling an ARP cache for InfiniBand SA queries and