refresh

diff --git a/meta b/meta
index 7d3911812b1253dbd81f71d6ebdf719fe2f965ed..e237f0fec5d0f6763f5f31c3feb9255ec76f566c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 742163d4f3543d00b43ad578c1a3164ca760da7c
-Head: 17b97cc362e4850fe7b826d7f108019dbafabcd3
+Previous: 4eb44808a646b407f60d24f715f57e3604e76c69
+Head: 0552c564a9fa694a4954a76c4dc011c2ef0da041
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: ff0af9d581e9a8ca9b6e1467d7484b0de619b0d2
-  refresh-temp: 17b97cc362e4850fe7b826d7f108019dbafabcd3
+  daemonize: 0552c564a9fa694a4954a76c4dc011c2ef0da041
 Unapplied:
   rel-1.0.6: 01c9f3298c9da13ed42a1506e1546abb5c4fcec0
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 0b5ae79f70eba4971a67546fef79fc5d59367c24..52b0f4ff4a15b0a5b503c6e2bce76f39941cf518 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    98dea5a2ee9946a718b1b722725010445646dc9b
+Top:    0cc8a02808dc9a687049835068f5b166890bd4b7
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -80,7 +80,7 @@ index 503ad72..c5efa7c 100644
        cp ibacm.spec $(distdir)
 diff --git a/ibacm.init b/ibacm.init
 new file mode 100644
-index 0000000..411bb14
+index 0000000..f6e5573
 --- /dev/null
 +++ b/ibacm.init
 @@ -0,0 +1,99 @@
@@ -114,7 +114,7 @@ index 0000000..411bb14
 +{
 +    echo -n "Starting ibacm daemon:"
 +
-+    daemon ibacm
++    daemon %prefix%/sbin/ibacm
 +    RC=$?
 +    [ $RC -eq 0 ] && touch $subsys
 +    echo

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5d56e3c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 98dea5a2ee9946a718b1b722725010445646dc9b
-Top:    0cc8a02808dc9a687049835068f5b166890bd4b7
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 16:38:17 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init b/ibacm.init
-index 411bb14..f6e5573 100644
---- a/ibacm.init
-+++ b/ibacm.init
-@@ -28,7 +28,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
- 
--    daemon ibacm
-+    daemon %prefix%/sbin/ibacm
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo