refresh (create temporary patch)

diff --git a/meta b/meta
index 229fd9c47f4a5c32c6d0a82c0963cdbf4f39d9c2..f8f275c11ed7c831168ef98ab643241810cd6738 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: b9cd7c42d469d9f576b8ba86bc9fd6b0f0c7bbc8
-Head: cdaebe3b87e93198d0db66490e5391880eee3c8d
+Previous: 219b30a419f83171fc676c3d130007c260184183
+Head: 5663dc75992fbd257edcc541af5c684c92272b06
 Applied:
   suse2: cdaebe3b87e93198d0db66490e5391880eee3c8d
+  refresh-temp: 5663dc75992fbd257edcc541af5c684c92272b06
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..b96b99d
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,85 @@
+Bottom: afe980c956885270d37ac477224fbb3eec2baa01
+Top:    46c53ac344da64e7bc8fd94d35f14f4aeccdb11c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2014-02-04 19:15:02 -0800
+
+Refresh of suse2
+
+---
+
+diff --git a/ibacm.init.in b/ibacm.init.in
+index db7e870..d58abbf 100644
+--- a/ibacm.init.in
++++ b/ibacm.init.in
+@@ -27,30 +27,32 @@ 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; }
+ 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+"$@"}; }
++      _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+"$@"}; }
++      _success() { rc_status -v; }
++      _failure() { rc_status -v; }
+ fi    
+ 
+ start()
+ {
+     echo -n "Starting ibacm daemon:"
+-    daemon @prefix@/sbin/ibacm
++    _daemon @prefix@/sbin/ibacm
+     if [[ $RETVAL -eq 0 ]]; then
+-        success
++        _success
+     else
+-        failure
++        _failure
+     fi
+-    echo
+ }
+ 
+ stop()
+@@ -58,12 +60,11 @@ stop()
+     echo -n "Stopping ibacm daemon:"
+     killproc -p $pidfile ibacm
+     if [[ $RETVAL -eq 0 ]]; then
+-        success
++        _success
+     else
+-        failure
++        _failure
+     fi
+     rm -f $subsys
+-    echo
+ }
+ 
+ status()
+@@ -80,11 +81,10 @@ status()
+         RETVAL=0
+     fi
+     if [[ $RETVAL -eq 0 ]]; then
+-        success
++        _success
+     else
+-        failure
++        _failure
+     fi
+-    echo
+ }
+ 
+ restart ()