refresh

diff --git a/meta b/meta
index 5c820a83a81297d164b6e92135b57793c503c7fa..a7dec3247dad42f70ac104c5bdfe7641ebec9364 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b12ca31d05807007ecc4f406191ea96335f56ed6
-Head: ec95178782eb0029e8b259dbc60967ea24370d4a
+Previous: ebb0ad1223cf9fce590065b9bd1192b1fab3b9eb
+Head: 7f7eac99a03fc24912c3678d97baa5f123d481ca
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: a7cbf193e1380f030e1dc3ac254d5f8b809addbf
-  refresh-temp: ec95178782eb0029e8b259dbc60967ea24370d4a
+  daemonize: 7f7eac99a03fc24912c3678d97baa5f123d481ca
 Unapplied:
   rel-1.0.6: 63d6392e7476c540f12de9f70c2d8c7d4fb04241
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 322bbe87c562028574d8b6e7879dc9b324a96256..9ae819097dc9a0108d69c48f40a372a8e0fce543 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    bcfe55a7b8465a2de8f31db6b58294a141a92341
+Top:    cb8b3fd3a630ee2c1788a44465a4c190e634b77f
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-30 16:31:08 -0700
 
@@ -72,10 +72,10 @@ index 503ad72..96a4514 100644
        cp ibacm.spec $(distdir)
 diff --git a/ibacm.init b/ibacm.init
 new file mode 100644
-index 0000000..4000cb6
+index 0000000..a3db7e9
 --- /dev/null
 +++ b/ibacm.init
-@@ -0,0 +1,100 @@
+@@ -0,0 +1,101 @@
 +#!/bin/bash
 +#
 +# Bring up/down the ibacm daemon
@@ -97,9 +97,10 @@ index 0000000..4000cb6
 +#     host route lookups.
 +### END INIT INFO
 +
++PATH=%PATH%:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 +pidfile=/var/run/ibacm.pid
 +subsys=/var/lock/subsys/ibacm
-+prog=$(sbindir)/ibacm
++prog=ibacm
 +
 +. /etc/rc.d/init.d/functions
 +

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2dd3487..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: bcfe55a7b8465a2de8f31db6b58294a141a92341
-Top:    cb8b3fd3a630ee2c1788a44465a4c190e634b77f
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 16:49:39 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init b/ibacm.init
-index 4000cb6..a3db7e9 100644
---- a/ibacm.init
-+++ b/ibacm.init
-@@ -19,9 +19,10 @@
- #     host route lookups.
- ### END INIT INFO
- 
-+PATH=%PATH%:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
- pidfile=/var/run/ibacm.pid
- subsys=/var/lock/subsys/ibacm
--prog=$(sbindir)/ibacm
-+prog=ibacm
- 
- . /etc/rc.d/init.d/functions