refresh

diff --git a/meta b/meta
index c63e88b174d573e0d6ab6029630824dbea5d0da7..aaf3fbbf7567be228dc5064377665fd47c7749a3 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 3a0dcb0ab55656f405baa99b763f10bf6b59eb1c
-Head: 80b52c78d725e61d621169916cae55a3696c779e
+Previous: 327584228e75482270df1e907799b2d6bb1d7bc7
+Head: 872ac26e4237ab0ca77f4ea362c89f9c203b9251
 Applied:
-  suse2: cfc137b3e391aad3f646c013a2eced54f6df8ca5
-  refresh-temp: 80b52c78d725e61d621169916cae55a3696c779e
+  suse2: 872ac26e4237ab0ca77f4ea362c89f9c203b9251
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8b35e24..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,69 +0,0 @@
-Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    be260586c77db168d819117526acb1d87fb0e199
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 16:02:12 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index bd2d1bd..3c31ec1 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -22,28 +22,47 @@
- pidfile=/var/run/ibacm.pid
- subsys=/var/lock/subsys/ibacm
- 
--. /etc/rc.d/init.d/functions
-+if [-f /etc/init.d/functions]; then
-+      # RHEL / CentOS / SL / Fedora
-+      . /etc/init.d/functions
-+      rc_status() { :; }
-+      rc_exit()   { exit $RETVAL; }
-+elif [-f /lib/lsb/init-functions]; then
-+      # SLES / OpenSuSE / Debian
-+      . /lib/lsb/init-functions
-+      rc_exit() { exit $RETVAL; }
-+      success() { log_success_msg; }
-+      failure() { log_failure_msg; }
-+elif [-f /etc/rc.status]; then
-+      # Older SuSE
-+      . /etc/rc.status
-+      success() { rc_status -v; }
-+      failure() { rc_status -v; }
-+fi    
- 
- start()
- {
-     echo -n "Starting ibacm daemon:"
--
-     daemon @prefix@/sbin/ibacm
--    RC=$?
--    [ $RC -eq 0 ] && touch $subsys
-+    if [$RETVAL -eq 0]; then
-+        success
-+    else
-+        failure
-+    fi
-     echo
--    return $RC
- }
- 
- stop()
- {
-     echo -n "Stopping ibacm daemon:"
--
-     killproc -p $pidfile ibacm
--    RC=$?
-+    if [$RETVAL -eq 0]; then
-+        success
-+    else
-+        failure
-+    fi
-     rm -f $subsys
-     echo
--    return $RC
- }
- 
- status()

diff --git a/patches/suse2 b/patches/suse2
index 3a8c96696037cdee90c253c7531f58c3c03b85a8..11faab4d97f7f8c9d25ec8c461524b5b4d8d60bc 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
+Top:    be260586c77db168d819117526acb1d87fb0e199
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-02-04 15:47:22 -0800
 
@@ -10,4 +10,63 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/ibacm.init.in b/ibacm.init.in
+index bd2d1bd..3c31ec1 100644
+--- a/ibacm.init.in
++++ b/ibacm.init.in
+@@ -22,28 +22,47 @@
+ pidfile=/var/run/ibacm.pid
+ subsys=/var/lock/subsys/ibacm
+ 
+-. /etc/rc.d/init.d/functions
++if [-f /etc/init.d/functions]; then
++      # RHEL / CentOS / SL / Fedora
++      . /etc/init.d/functions
++      rc_status() { :; }
++      rc_exit()   { exit $RETVAL; }
++elif [-f /lib/lsb/init-functions]; then
++      # SLES / OpenSuSE / Debian
++      . /lib/lsb/init-functions
++      rc_exit() { exit $RETVAL; }
++      success() { log_success_msg; }
++      failure() { log_failure_msg; }
++elif [-f /etc/rc.status]; then
++      # Older SuSE
++      . /etc/rc.status
++      success() { rc_status -v; }
++      failure() { rc_status -v; }
++fi    
+ 
+ start()
+ {
+     echo -n "Starting ibacm daemon:"
+-
+     daemon @prefix@/sbin/ibacm
+-    RC=$?
+-    [ $RC -eq 0 ] && touch $subsys
++    if [$RETVAL -eq 0]; then
++        success
++    else
++        failure
++    fi
+     echo
+-    return $RC
+ }
+ 
+ stop()
+ {
+     echo -n "Stopping ibacm daemon:"
+-
+     killproc -p $pidfile ibacm
+-    RC=$?
++    if [$RETVAL -eq 0]; then
++        success
++    else
++        failure
++    fi
+     rm -f $subsys
+     echo
+-    return $RC
+ }
+ 
+ status()