refresh

diff --git a/meta b/meta
index d53b07733efbb71d1a60648deb73ba07865129d4..bc25c772c6947b972ee5b845580933f9095006e8 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: 8db2eaee8327f80b7fc21625eacf5a10ba68adb7
-Head: e403bfbc10cd35cee7386f9e876635a464cc4404
+Previous: 9200bf7270b7a2c1d41c6a8c1defc0e32ae4e13b
+Head: 9b5993fbd79bc35d4d5cb276f6e7b01da93dc67a
 Applied:
-  suse2: 872ac26e4237ab0ca77f4ea362c89f9c203b9251
-  refresh-temp: e403bfbc10cd35cee7386f9e876635a464cc4404
+  suse2: 9b5993fbd79bc35d4d5cb276f6e7b01da93dc67a
 Unapplied:
   suse: 7076e2a00570a3cda4e4ce034419399a23ebfb0a
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 8b69d81..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,49 +0,0 @@
-Bottom: be260586c77db168d819117526acb1d87fb0e199
-Top:    fb9f097f0cf8ff4c09c0ccb617f41f4b916b1573
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2014-02-04 16:26:12 -0800
-
-Refresh of suse2
-
----
-
-diff --git a/ibacm.init.in b/ibacm.init.in
-index 3c31ec1..2f340a5 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -104,15 +104,25 @@ case $1 in
- esac
- 
- case $1 in
--    start) start; RC=$? ;;
--    stop) stop; RC=$? ;;
--    restart) restart; RC=$? ;;
--    reload) RC=3 ;;
--    condrestart) condrestart; RC=$? ;;
--    try-restart) condrestart; RC=$? ;;
--    force-reload) condrestart; RC=$? ;;
--    status) status; RC=$? ;;
--    *) usage; RC=$? ;;
-+    start)
-+        start
-+        ;;
-+    stop)
-+        stop
-+        ;;
-+    restart | reload)
-+        restart
-+        ;;
-+    condrestart | try-restart | force-reload)
-+        condrestart
-+        ;;
-+    status)
-+        status
-+        ;;
-+    *)
-+        usage
-+        ;;
- esac
- 
--exit $RC
-+_rc_status_all=$RETVAL
-+rc_exit

diff --git a/patches/suse2 b/patches/suse2
index 11faab4d97f7f8c9d25ec8c461524b5b4d8d60bc..d97a5d2d7e754ec73c58733077e7557af9572d16 100644 (file)
--- a/patches/suse2
+++ b/patches/suse2
@@ -1,5 +1,5 @@
 Bottom: 2f6704a0b1af76a5a8011d2f8e56ad9c4c274210
-Top:    be260586c77db168d819117526acb1d87fb0e199
+Top:    fb9f097f0cf8ff4c09c0ccb617f41f4b916b1573
 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..3c31ec1 100644
+index bd2d1bd..2f340a5 100644
 --- a/ibacm.init.in
 +++ b/ibacm.init.in
 @@ -22,28 +22,47 @@
@@ -70,3 +70,39 @@ index bd2d1bd..3c31ec1 100644
  }
  
  status()
+@@ -85,15 +104,25 @@ case $1 in
+ esac
+ 
+ case $1 in
+-    start) start; RC=$? ;;
+-    stop) stop; RC=$? ;;
+-    restart) restart; RC=$? ;;
+-    reload) RC=3 ;;
+-    condrestart) condrestart; RC=$? ;;
+-    try-restart) condrestart; RC=$? ;;
+-    force-reload) condrestart; RC=$? ;;
+-    status) status; RC=$? ;;
+-    *) usage; RC=$? ;;
++    start)
++        start
++        ;;
++    stop)
++        stop
++        ;;
++    restart | reload)
++        restart
++        ;;
++    condrestart | try-restart | force-reload)
++        condrestart
++        ;;
++    status)
++        status
++        ;;
++    *)
++        usage
++        ;;
+ esac
+ 
+-exit $RC
++_rc_status_all=$RETVAL
++rc_exit