refresh

diff --git a/meta b/meta
index 111df7fc79300ddecca5b65277a361fe547ee7a4..b14649619de2a845a08efadcda45f8cd0705d1da 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: 33712a819f73f0c2428531ad16414ec486545503
-Head: dc26c2f3725803bc093bdfccc285905b529caa6a
+Previous: 4529121b0905992027f369e24688375b7de2c458
+Head: 095db89db1f11f6f35d3c9d330696aa74321aba1
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 1d8b14cfa22a633d3da5a11a481c165ca176881b
-  refresh-temp: dc26c2f3725803bc093bdfccc285905b529caa6a
+  daemonize: 095db89db1f11f6f35d3c9d330696aa74321aba1
 Unapplied:
   rel-1.0.6: f034b76ddefda4ecf9596cb9008f077d4105195f
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index b0baa0842bb45e0b17ebe0e3a4414833a299ec57..7280915dcbbbdd49a2883a4d625bcef9cbd5c0d3 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    b937c39f33d5b1c8640372538ff3b72bd7e7b75a
+Top:    5b7a3a72a9f151c6c89dc82c1c7394599f6076b2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -97,7 +97,7 @@ index 736f657..1cc28ed 100644
  AC_OUTPUT\r
 diff --git a/ibacm.init.in b/ibacm.init.in
 new file mode 100644
-index 0000000..032b6a4
+index 0000000..20bbfcf
 --- /dev/null
 +++ b/ibacm.init.in
 @@ -0,0 +1,99 @@
@@ -131,7 +131,7 @@ index 0000000..032b6a4
 +{
 +    echo -n "Starting ibacm daemon:"
 +
-+    daemon @sbindir@/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 9416841..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: b937c39f33d5b1c8640372538ff3b72bd7e7b75a
-Top:    5b7a3a72a9f151c6c89dc82c1c7394599f6076b2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 20:48:08 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index 032b6a4..20bbfcf 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -28,7 +28,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
- 
--    daemon @sbindir@/ibacm
-+    daemon @_sbindir_@/ibacm
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo