refresh

diff --git a/meta b/meta
index 0e83826939b1debbf7a1816901217dcf9a2a9700..3dedf998e82b1dbc0b863f6f0c8829958270a550 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 629e25cd56f31a8b0d593bd92c32fa5a1b61dccc
-Head: d96f21c1764299a27d486c56b4e6168936f0a47a
+Previous: d082f6714cfed9f8471b3e0212706f7e1322e994
+Head: f27fb61f3b6a0c82f4ac2b3342ccd2a07ecd7746
 Applied:
-  suse2: 22be343ce00d9019ea6c370525a6ab39152fe906
-  refresh-temp: d96f21c1764299a27d486c56b4e6168936f0a47a
+  suse2: f27fb61f3b6a0c82f4ac2b3342ccd2a07ecd7746
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1dff773..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: 46c53ac344da64e7bc8fd94d35f14f4aeccdb11c
-Top:    d20497f2f20b23d2b39a63704b98bafb16372bf1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 19:29:50 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index d58abbf..d939c76 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -27,21 +27,24 @@ daemon() { /sbin/daemon   ${1+"$@"}; }
- if [ -s /etc/init.d/functions ]; then
-       # RHEL / CentOS / SL / Fedora
-       . /etc/init.d/functions
--        _daemon()  { daemon ${1+"$@"}; }
--        _success() { success; echo; }
--        _failure() { failure; echo; }
-+        _daemon()   { daemon ${1+"$@"}; }
-+        _checkpid() { checkpid `cat $pidfile`; }
-+        _success()  { success; echo; }
-+        _failure()  { failure; echo; }
- 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; }
-+      _daemon()   { /sbin/start_daemon ${1+"$@"}; }
-+        _checkpid() { checkproc -p $pidfile @prefix@/sbin/ibacm; }
-+      _success()  { log_success_msg; }
-+      _failure()  { log_failure_msg; }
- elif [ -s /etc/rc.status ]; then
-       # Older SuSE
-       . /etc/rc.status
--      _daemon()  { /sbin/start_daemon ${1+"$@"}; }
--      _success() { rc_status -v; }
--      _failure() { rc_status -v; }
-+      _daemon()   { /sbin/start_daemon ${1+"$@"}; }
-+        _checkpid() { checkproc -p $pidfile @prefix@/sbin/ibacm; }
-+      _success()  { rc_status -v; }
-+      _failure()  { rc_status -v; }
- fi    
- 
- start()
-@@ -73,7 +76,7 @@ status()
-     if [ ! -f $subsys -a ! -f $pidfile ]; then
-         RETVAL=3
-     elif [ -f $pidfile ]; then
--        checkpid `cat $pidfile`
-+        _checkpid
-         RETVAL=$?
-     elif [ -f $subsys ]; then
-         RETVAL=2

diff --git a/patches/suse2 b/patches/suse2
index f7f0cd394db6d1f5c18c6c3c059eac0db3c59b30..636dec170df62cf817b18211657afbccee5b19a2 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    46c53ac344da64e7bc8fd94d35f14f4aeccdb11c
+Top:    d20497f2f20b23d2b39a63704b98bafb16372bf1
 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..d58abbf 100644
+index bd2d1bd..d939c76 100644
 --- a/ibacm.init.in
 +++ b/ibacm.init.in
-@@ -22,41 +22,68 @@
+@@ -22,41 +22,71 @@
  pidfile=/var/run/ibacm.pid
  subsys=/var/lock/subsys/ibacm
  
@@ -24,21 +24,24 @@ index bd2d1bd..d58abbf 100644
 +if [ -s /etc/init.d/functions ]; then
 +      # RHEL / CentOS / SL / Fedora
 +      . /etc/init.d/functions
-+        _daemon()  { daemon ${1+"$@"}; }
-+        _success() { success; echo; }
-+        _failure() { failure; echo; }
++        _daemon()   { daemon ${1+"$@"}; }
++        _checkpid() { checkpid `cat $pidfile`; }
++        _success()  { success; echo; }
++        _failure()  { failure; echo; }
 +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; }
++      _daemon()   { /sbin/start_daemon ${1+"$@"}; }
++        _checkpid() { checkproc -p $pidfile @prefix@/sbin/ibacm; }
++      _success()  { log_success_msg; }
++      _failure()  { log_failure_msg; }
 +elif [ -s /etc/rc.status ]; then
 +      # Older SuSE
 +      . /etc/rc.status
-+      _daemon()  { /sbin/start_daemon ${1+"$@"}; }
-+      _success() { rc_status -v; }
-+      _failure() { rc_status -v; }
++      _daemon()   { /sbin/start_daemon ${1+"$@"}; }
++        _checkpid() { checkproc -p $pidfile @prefix@/sbin/ibacm; }
++      _success()  { rc_status -v; }
++      _failure()  { rc_status -v; }
 +fi    
  
  start()
@@ -85,7 +88,7 @@ index bd2d1bd..d58abbf 100644
 -      return $?
 +        RETVAL=3
 +    elif [ -f $pidfile ]; then
-+        checkpid `cat $pidfile`
++        _checkpid
 +        RETVAL=$?
 +    elif [ -f $subsys ]; then
 +        RETVAL=2
@@ -101,7 +104,7 @@ index bd2d1bd..d58abbf 100644
      fi
  }
  
-@@ -85,15 +112,24 @@ case $1 in
+@@ -85,15 +115,24 @@ case $1 in
  esac
  
  case $1 in