refresh

diff --git a/meta b/meta
index 896e7d1b7520e4d1ad621be133565d00530d8c6c..d9db0573f73950807cf45bd904ca1c44ca7ce3fc 100644 (file)
--- a/meta
+++ b/meta
@@ -1,14 +1,13 @@
 Version: 1
-Previous: f4030e6f117daa189d58186d2d8be80bb313e1a4
-Head: 8f7d5da7b1118f4432531502eeaad9d5f92c6e35
+Previous: 3c0fb5bfc8d5635350ac9304149ca284fff5e849
+Head: d25da4c45495d56460594447478ff454879520e1
 Applied:
   mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
   af_ib: c366c39d4afc939932efc2f5158ae332161369bf
   typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
   ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
   err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
-  daemonize: 9bb8de8ab4a072470d6d17bbde7de89fee3a475b
-  refresh-temp: 8f7d5da7b1118f4432531502eeaad9d5f92c6e35
+  daemonize: d25da4c45495d56460594447478ff454879520e1
 Unapplied:
   rel-1.0.6: 3f1346eb78bd36573083258f0c8c301e7a9ad728
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 7c7b38785d4d1e99fd9d70b0bdb5e65ad3733d08..4793c3bf8150afca079ee64f259d93703fbbe830 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top:    c46ab6059b0073d98d5ca1e32bce9f872677e6cc
+Top:    231677cdb6de9663d94f70a04f7e943aba36b389
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -91,10 +91,10 @@ index 736f657..0ed6168 100644
  AC_OUTPUT\r
 diff --git a/ibacm.init.in b/ibacm.init.in
 new file mode 100644
-index 0000000..d8c34d5
+index 0000000..96d4e01
 --- /dev/null
 +++ b/ibacm.init.in
-@@ -0,0 +1,99 @@
+@@ -0,0 +1,100 @@
 +#!/bin/bash
 +#
 +# Bring up/down the ibacm daemon
@@ -116,6 +116,7 @@ index 0000000..d8c34d5
 +#     host route lookups.
 +### END INIT INFO
 +
++sbindir=%{sbindir}
 +pidfile=/var/run/ibacm.pid
 +subsys=/var/lock/subsys/ibacm
 +
@@ -125,7 +126,7 @@ index 0000000..d8c34d5
 +{
 +    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 9bca7b4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,30 +0,0 @@
-Bottom: c46ab6059b0073d98d5ca1e32bce9f872677e6cc
-Top:    231677cdb6de9663d94f70a04f7e943aba36b389
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-04-05 17:25:34 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index d8c34d5..96d4e01 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -19,6 +19,7 @@
- #     host route lookups.
- ### END INIT INFO
- 
-+sbindir=%{sbindir}
- pidfile=/var/run/ibacm.pid
- subsys=/var/lock/subsys/ibacm
- 
-@@ -28,7 +29,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
- 
--    daemon %{_sbindir}/ibacm
-+    daemon $sbindir/ibacm
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo