From ca4d33c2dc102a31a62b2862020f789dacede3ea Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Tue, 4 Feb 2014 19:15:02 -0800 Subject: [PATCH] refresh --- meta | 7 ++-- patches/refresh-temp | 85 -------------------------------------------- patches/suse2 | 44 ++++++++++++----------- 3 files changed, 26 insertions(+), 110 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index f8f275c..f74e015 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 219b30a419f83171fc676c3d130007c260184183 -Head: 5663dc75992fbd257edcc541af5c684c92272b06 +Previous: 0f55c6135e235a8ae39e773173cd4d24befacc91 +Head: 22be343ce00d9019ea6c370525a6ab39152fe906 Applied: - suse2: cdaebe3b87e93198d0db66490e5391880eee3c8d - refresh-temp: 5663dc75992fbd257edcc541af5c684c92272b06 + suse2: 22be343ce00d9019ea6c370525a6ab39152fe906 Unapplied: suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a dev-name2ip: 8e00708e882239292492e13aa51c82042255933c diff --git a/patches/refresh-temp b/patches/refresh-temp deleted file mode 100644 index b96b99d..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,85 +0,0 @@ -Bottom: afe980c956885270d37ac477224fbb3eec2baa01 -Top: 46c53ac344da64e7bc8fd94d35f14f4aeccdb11c -Author: Sean Hefty -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 () diff --git a/patches/suse2 b/patches/suse2 index 8816b30..f7f0cd3 100644 --- a/patches/suse2 +++ b/patches/suse2 @@ -1,5 +1,5 @@ Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210 -Top: afe980c956885270d37ac477224fbb3eec2baa01 +Top: 46c53ac344da64e7bc8fd94d35f14f4aeccdb11c Author: Sean Hefty Date: 2014-02-04 15:47:22 -0800 @@ -11,10 +11,10 @@ Signed-off-by: Sean Hefty --- diff --git a/ibacm.init.in b/ibacm.init.in -index bd2d1bd..db7e870 100644 +index bd2d1bd..d58abbf 100644 --- a/ibacm.init.in +++ b/ibacm.init.in -@@ -22,42 +22,69 @@ +@@ -22,41 +22,68 @@ pidfile=/var/run/ibacm.pid subsys=/var/lock/subsys/ibacm @@ -24,34 +24,38 @@ index bd2d1bd..db7e870 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; } +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 - RC=$? - [ $RC -eq 0 ] && touch $subsys +- echo +- return $RC ++ _daemon @prefix@/sbin/ibacm + if [[ $RETVAL -eq 0 ]]; then -+ success ++ _success + else -+ failure ++ _failure + fi - echo -- return $RC } stop() @@ -61,12 +65,12 @@ index bd2d1bd..db7e870 100644 killproc -p $pidfile ibacm - RC=$? + if [[ $RETVAL -eq 0 ]]; then -+ success ++ _success + else -+ failure ++ _failure + fi rm -f $subsys - echo +- echo - return $RC } @@ -91,14 +95,12 @@ index bd2d1bd..db7e870 100644 - if [ -f $subsys ]; then - return 2 + if [[ $RETVAL -eq 0 ]]; then -+ success ++ _success + else -+ failure ++ _failure fi -+ echo } - restart () @@ -85,15 +112,24 @@ case $1 in esac -- 2.46.0