refresh

diff --git a/meta b/meta
index 8353515b6c94f663c2feaa55a97209a4eb02df65..c301160b0e2890fa730aae5850a516ea13c98cd1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: c106f524a66b4c14d3e11a2090f41a36f2930b39
-Head: a1d9729ff7f63670d920a0edf7216aa85ac01929
+Previous: 18a267a8af940adc3d39dc89569e4f8770b78e55
+Head: 72df68c0a4e150a026280568df89d2f18bf05527
 Applied:
-  suse2: 3776a0121670efa195b2de28ddb2857537d47f66
-  refresh-temp: a1d9729ff7f63670d920a0edf7216aa85ac01929
+  suse2: 72df68c0a4e150a026280568df89d2f18bf05527
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index ec6bbae..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,42 +0,0 @@
-Bottom: 328177f1a80f89cf97f0bdbef5501ac2440fa943
-Top:    f43e7d1ac22a118b34a9c887eb487436f915f2b0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 17:57:10 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index bca715a..ca5a947 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -24,16 +24,16 @@ subsys=/var/lock/subsys/ibacm
- 
- daemon() { /sbin/daemon   ${1+"$@"}; }
- 
--if [-s /etc/init.d/functions]; then
-+if [ -s /etc/init.d/functions ]; then
-       # RHEL / CentOS / SL / Fedora
-       . /etc/init.d/functions
--elif [-s /lib/lsb/init-functions]; then
-+elif [ -s /lib/lsb/init-functions ]; then
-       # SLES / OpenSuSE / Debian
-       . /lib/lsb/init-functions
-       daemon()  { /sbin/start_daemon ${1+"$@"}; }
-       success() { log_success_msg; }
-       failure() { log_failure_msg; }
--elif [-s /etc/rc.status]; then
-+elif [ -s /etc/rc.status ]; then
-       # Older SuSE
-       . /etc/rc.status
-       daemon()  { /sbin/start_daemon ${1+"$@"}; }
-@@ -57,7 +57,7 @@ stop()
- {
-     echo -n "Stopping ibacm daemon:"
-     killproc -p $pidfile ibacm
--    if [[$RETVAL -eq 0]]; then
-+    if [ $RETVAL -eq 0 ]; then
-         success
-     else
-         failure

diff --git a/patches/suse2 b/patches/suse2
index a3ca6e650a792c086d3476f9260af04de90a651a..c433eb05d7d8c8e2137f68337e8b1022c58af722 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    328177f1a80f89cf97f0bdbef5501ac2440fa943
+Top:    f43e7d1ac22a118b34a9c887eb487436f915f2b0
 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..bca715a 100644
+index bd2d1bd..ca5a947 100644
 --- a/ibacm.init.in
 +++ b/ibacm.init.in
 @@ -22,41 +22,61 @@
@@ -21,16 +21,16 @@ index bd2d1bd..bca715a 100644
 -. /etc/rc.d/init.d/functions
 +daemon() { /sbin/daemon   ${1+"$@"}; }
 +
-+if [-s /etc/init.d/functions]; then
++if [ -s /etc/init.d/functions ]; then
 +      # RHEL / CentOS / SL / Fedora
 +      . /etc/init.d/functions
-+elif [-s /lib/lsb/init-functions]; then
++elif [ -s /lib/lsb/init-functions ]; then
 +      # SLES / OpenSuSE / Debian
 +      . /lib/lsb/init-functions
 +      daemon()  { /sbin/start_daemon ${1+"$@"}; }
 +      success() { log_success_msg; }
 +      failure() { log_failure_msg; }
-+elif [-s /etc/rc.status]; then
++elif [ -s /etc/rc.status ]; then
 +      # Older SuSE
 +      . /etc/rc.status
 +      daemon()  { /sbin/start_daemon ${1+"$@"}; }
@@ -60,7 +60,7 @@ index bd2d1bd..bca715a 100644
 -
      killproc -p $pidfile ibacm
 -    RC=$?
-+    if [[$RETVAL -eq 0]]; then
++    if [ $RETVAL -eq 0 ]; then
 +        success
 +    else
 +        failure