refresh

diff --git a/meta b/meta
index 0236bdf0b580f6a662250e13bdebc0e031194e3f..229fd9c47f4a5c32c6d0a82c0963cdbf4f39d9c2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8597a3148b0fa448ca7651e236b62e45ec77aa73
-Head: 889a3bdb61d81e97fd714f4cf9be6a797675631c
+Previous: b9cd7c42d469d9f576b8ba86bc9fd6b0f0c7bbc8
+Head: cdaebe3b87e93198d0db66490e5391880eee3c8d
 Applied:
-  suse2: 198afa55c88173101db25351194b58bcaef2b2e8
-  refresh-temp: 889a3bdb61d81e97fd714f4cf9be6a797675631c
+  suse2: cdaebe3b87e93198d0db66490e5391880eee3c8d
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index f653b68..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,44 +0,0 @@
-Bottom: 513889dc5fceb3244309da13a4169ac3546e2ee5
-Top:    afe980c956885270d37ac477224fbb3eec2baa01
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 19:08:08 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index 18ea03a..db7e870 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -68,16 +68,23 @@ stop()
- 
- status()
- {
-+    echo -n "Checking for ibacm service "
-     if [ ! -f $subsys -a ! -f $pidfile ]; then
--       return 3
--    fi
--    if [ -f $pidfile ]; then
--       checkpid `cat $pidfile`
--       return $?
-+        RETVAL=3
-+    elif [ -f $pidfile ]; then
-+        checkpid `cat $pidfile`
-+        RETVAL=$?
-+    elif [ -f $subsys ]; then
-+        RETVAL=2
-+    else
-+        RETVAL=0
-     fi
--    if [ -f $subsys ]; then
--       return 2
-+    if [[ $RETVAL -eq 0 ]]; then
-+        success
-+    else
-+        failure
-     fi
-+    echo
- }
- 
- restart ()

diff --git a/patches/suse2 b/patches/suse2
index 24e92aae60672dd6716254a03c6e979e38b0e2f4..8816b30b65480b99798fb44981f060ba35d12d53 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    513889dc5fceb3244309da13a4169ac3546e2ee5
+Top:    afe980c956885270d37ac477224fbb3eec2baa01
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2014-02-04 15:47:22 -0800
 
@@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/ibacm.init.in b/ibacm.init.in
-index bd2d1bd..18ea03a 100644
+index bd2d1bd..db7e870 100644
 --- a/ibacm.init.in
 +++ b/ibacm.init.in
-@@ -22,41 +22,61 @@
+@@ -22,42 +22,69 @@
  pidfile=/var/run/ibacm.pid
  subsys=/var/lock/subsys/ibacm
  
@@ -72,23 +72,34 @@ index bd2d1bd..18ea03a 100644
  
  status()
  {
++    echo -n "Checking for ibacm service "
      if [ ! -f $subsys -a ! -f $pidfile ]; then
 -      return 3
-+       return 3
-     fi
-     if [ -f $pidfile ]; then
+-    fi
+-    if [ -f $pidfile ]; then
 -      checkpid `cat $pidfile`
 -      return $?
-+       checkpid `cat $pidfile`
-+       return $?
++        RETVAL=3
++    elif [ -f $pidfile ]; then
++        checkpid `cat $pidfile`
++        RETVAL=$?
++    elif [ -f $subsys ]; then
++        RETVAL=2
++    else
++        RETVAL=0
      fi
-     if [ -f $subsys ]; then
+-    if [ -f $subsys ]; then
 -      return 2
-+       return 2
++    if [[ $RETVAL -eq 0 ]]; then
++        success
++    else
++        failure
      fi
++    echo
  }
  
-@@ -85,15 +105,24 @@ case $1 in
+ restart ()
+@@ -85,15 +112,24 @@ case $1 in
  esac
  
  case $1 in