refresh

diff --git a/meta b/meta
index d04b98f3bb96b276bef433414eee4ce076fa75a4..88d6f14dc1831c0596cbaffabc0216bd7527ad9b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: f8db7f0e6bae1be28b46ac837a9c9f99cf99d11b
-Head: f322b71be141dc92172f16563a9a96803d538ba7
+Previous: ca31659dc6d16db71741527bf9a16f44ee75300f
+Head: 7f4664a8bc5adc1b78c32163c35f66b7b07915fb
 Applied:
-  suse2: 72df68c0a4e150a026280568df89d2f18bf05527
-  refresh-temp: f322b71be141dc92172f16563a9a96803d538ba7
+  suse2: 7f4664a8bc5adc1b78c32163c35f66b7b07915fb
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 4cb5029..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: f43e7d1ac22a118b34a9c887eb487436f915f2b0
-Top:    02a651c8a36c5212916e853474768783a398f031
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 17:58:28 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index ca5a947..c8e3795 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -45,7 +45,7 @@ start()
- {
-     echo -n "Starting ibacm daemon:"
-     daemon @prefix@/sbin/ibacm
--    if [[$RETVAL -eq 0]]; then
-+    if [ $RETVAL -eq 0 ]; then
-         success
-     else
-         failure

diff --git a/patches/suse2 b/patches/suse2
index c433eb05d7d8c8e2137f68337e8b1022c58af722..926c7fcb3b3d4194f325e32214a49402c5c69169 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    f43e7d1ac22a118b34a9c887eb487436f915f2b0
+Top:    02a651c8a36c5212916e853474768783a398f031
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-02-04 15:47:22 -0800
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/ibacm.init.in b/ibacm.init.in
-index bd2d1bd..ca5a947 100644
+index bd2d1bd..c8e3795 100644
 --- a/ibacm.init.in
 +++ b/ibacm.init.in
 @@ -22,41 +22,61 @@
@@ -45,7 +45,7 @@ index bd2d1bd..ca5a947 100644
      daemon @prefix@/sbin/ibacm
 -    RC=$?
 -    [ $RC -eq 0 ] && touch $subsys
-+    if [[$RETVAL -eq 0]]; then
++    if [ $RETVAL -eq 0 ]; then
 +        success
 +    else
 +        failure