refresh

diff --git a/meta b/meta
index dbb6469b92c2d5a9d43f21228f21db4528ea1d06..d73c88bb7e7e98c4e44ff3f523748f125ccd3861 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 0b092675f1515904c93eda133dd892c95500cf64
-Head: 75936cf830a3879908f10c90b6a66a57cbb94ee3
+Previous: 0daa83b9b962b9b50b4694cdd3e60b7e1b5caa20
+Head: 3284b7265adb59fe336d804037e9f4ad21ec6a34
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 36a9d25a1169cfd288d2df14867d52ab89ae7393
-  refresh-temp: 75936cf830a3879908f10c90b6a66a57cbb94ee3
+  daemonize: 3284b7265adb59fe336d804037e9f4ad21ec6a34
 Unapplied:
   rel-1.0.6: d7fd43ec9a7673423198efdce328a917a7e1eeaa
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index d0d9f35db933f053b3eaf7446e830fcc4b81915d..9dc484869f55420e8fb719803d8e4841dfc8f3ca 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    2295f9ac5ca14f1683ad1c6cdda9528e84a77103
+Top:    6ea36239e9e1b001476660f0981d732676430a96
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -91,7 +91,7 @@ index 736f657..0ed6168 100644
  AC_OUTPUT\r
 diff --git a/ibacm.init.in b/ibacm.init.in
 new file mode 100644
-index 0000000..b715892
+index 0000000..032b6a4
 --- /dev/null
 +++ b/ibacm.init.in
 @@ -0,0 +1,99 @@
@@ -125,7 +125,7 @@ index 0000000..b715892
 +{
 +    echo -n "Starting ibacm daemon:"
 +
-+    daemon %prefix$/sbin/ibacm
++    daemon @sbindir@/ibacm
 +    RC=$?
 +    [ $RC -eq 0 ] && touch $subsys
 +    echo

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 659997c..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 2295f9ac5ca14f1683ad1c6cdda9528e84a77103
-Top:    6ea36239e9e1b001476660f0981d732676430a96
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 17:46:05 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index b715892..032b6a4 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -28,7 +28,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
- 
--    daemon %prefix$/sbin/ibacm
-+    daemon @sbindir@/ibacm
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo