refresh

diff --git a/meta b/meta
index cf6cdd36c96fe7ad7346f4c1edff917b28cca252..c28a9dc20abdbae6075c7ef50e34105a5a137a9e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 452a79e042315bcacde38ec32083c63891a67c87
-Head: ce411d8265972f4c7f529f5a90b8c045bfcb7947
+Previous: c86d7f1a1a2c62d6b5ba04eb87d863664d36d17c
+Head: 4a33f2b2b8ecf8b0ee0b1f9c5acb68415553dd33
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
-  daemonize: 7f7eac99a03fc24912c3678d97baa5f123d481ca
-  refresh-temp: ce411d8265972f4c7f529f5a90b8c045bfcb7947
+  daemonize: 4a33f2b2b8ecf8b0ee0b1f9c5acb68415553dd33
 Unapplied:
   rel-1.0.6: f64aeca033106149e88439569b852eb51b2e6d86
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/daemonize b/patches/daemonize
index 9ae819097dc9a0108d69c48f40a372a8e0fce543..582856731b6fb1b6566a9e4ae0cbf3a0aa7f2a78 100644 (file)
--- a/patches/daemonize
+++ b/patches/daemonize
@@ -1,5 +1,5 @@
 Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906
-Top:    cb8b3fd3a630ee2c1788a44465a4c190e634b77f
+Top:    02e5cbc02d439de21ba3946ef1fc7c3a2d591b2c
 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..a3db7e9
+index 0000000..2cf45fa
 --- /dev/null
 +++ b/ibacm.init
-@@ -0,0 +1,101 @@
+@@ -0,0 +1,102 @@
 +#!/bin/bash
 +#
 +# Bring up/down the ibacm daemon
@@ -97,18 +97,19 @@ index 0000000..a3db7e9
 +#     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
++PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 +prog=ibacm
++pidfile=/var/run/$prog.pid
++subsys=/var/lock/subsys/$prog
++progd=$(which $prog)
 +
 +. /etc/rc.d/init.d/functions
 +
 +start()
 +{
-+    echo -n "Starting ibacm daemon:"
++    echo -n "Starting $prog daemon:"
 +
-+    daemon $prog
++    daemon $progd
 +    RC=$?
 +    [ $RC -eq 0 ] && touch $subsys
 +    echo
@@ -117,9 +118,9 @@ index 0000000..a3db7e9
 +
 +stop()
 +{
-+    echo -n "Stopping ibacm daemon:"
++    echo -n "Stopping $prog daemon:"
 +
-+    killproc -p $pidfile $prog
++    killproc -p $pidfile $progd
 +    RC=$?
 +    rm -f $subsys
 +    echo

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index c3363f5..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,50 +0,0 @@
-Bottom: cb8b3fd3a630ee2c1788a44465a4c190e634b77f
-Top:    02e5cbc02d439de21ba3946ef1fc7c3a2d591b2c
-Author: sean.hefty@intel.com <sean.hefty@intel.com>
-Date:   2012-04-02 17:00:01 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/ibacm.init b/ibacm.init
-index a3db7e9..2cf45fa 100644
---- a/ibacm.init
-+++ b/ibacm.init
-@@ -19,18 +19,19 @@
- #     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
-+PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
- prog=ibacm
-+pidfile=/var/run/$prog.pid
-+subsys=/var/lock/subsys/$prog
-+progd=$(which $prog)
- 
- . /etc/rc.d/init.d/functions
- 
- start()
- {
--    echo -n "Starting ibacm daemon:"
-+    echo -n "Starting $prog daemon:"
- 
--    daemon $prog
-+    daemon $progd
-     RC=$?
-     [ $RC -eq 0 ] && touch $subsys
-     echo
-@@ -39,9 +40,9 @@ start()
- 
- stop()
- {
--    echo -n "Stopping ibacm daemon:"
-+    echo -n "Stopping $prog daemon:"
- 
--    killproc -p $pidfile $prog
-+    killproc -p $pidfile $progd
-     RC=$?
-     rm -f $subsys
-     echo