refresh

diff --git a/meta b/meta
index 1159a77529407e877485acf3c7b52457209ae045..05b4ce7ba0e3ebe0c69e5ea49b9209d91508ca5c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: bb92d81b76207f75b22510aae32ba928ecdb22a3
-Head: d2da14d5a30c34f2b4c25fd6541786236618b11a
+Previous: dd85e7e4d343a99922fa6b8e27a7f3893e151b7b
+Head: 0eb36b8d494d7d51ed3d25c71289c2f5abd845f9
 Applied:
   af_ib: fb683ba55480ada43c09aa48b3cb18bde139f72c
   rename-ibacm: 62fc4bdee12905d85332875439240523fad7bee0
-  init-script: 0ab09fc72f9eb8a4b432591f17991e17e8b8dab2
-  refresh-temp: d2da14d5a30c34f2b4c25fd6541786236618b11a
+  init-script: 0eb36b8d494d7d51ed3d25c71289c2f5abd845f9
 Unapplied:
   fixup-man: 3b3d0caee4b583c2853c12c6728dbfac03d544f9
   dev-name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/init-script b/patches/init-script
index 5c8929caaeaf74eafba7874ea18a7f2748ab23a0..520641cca1b425df981056f686252f244ed44a54 100644 (file)
--- a/patches/init-script
+++ b/patches/init-script
@@ -1,5 +1,5 @@
 Bottom: b7ef43780109283b77986862aa8504222eb78bce
-Top:    b7ef43780109283b77986862aa8504222eb78bce
+Top:    a3cb4424d2de12c0dffe8f97350084a997801ace
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-03-22 10:26:25 -0700
 
@@ -13,4 +13,122 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/ibacm.init b/ibacm.init
+new file mode 100644
+index 0000000..14588a1
+--- /dev/null
++++ b/ibacm.init
+@@ -0,0 +1,100 @@
++#!/bin/bash
++#
++# Bring up/down the ibacm daemon
++#
++# chkconfig: 2345 25 75
++# description: Starts/Stops InfiniBand ACM service
++#
++### BEGIN INIT INFO
++# Provides:       ibacm
++# Default-Start: 2 3 4 5
++# Default-Stop: 0 1 6
++# Required-Start: rdma $network
++# Required-Stop: rdma $network
++# Should-Start: opensm
++# Should-Stop: opensm
++# Short-Description: Starts and stops the InfiniBand ACM service
++# Description: The InfiniBand ACM service provides a user space implementation
++#     of someting resembling an ARP cache for InfiniBand SA queries and
++#     host route lookups.
++### END INIT INFO
++
++pidfile=/var/run/ibacm.pid
++subsys=/var/lock/subsys/ibacm
++prog=/usr/sbin/ibacm
++
++. /etc/rc.d/init.d/functions
++
++start()
++{
++    echo -n "Starting ibacm daemon:"
++
++    daemon $prog
++    RC=$?
++    [ $RC -eq 0 ] && touch $subsys
++    echo
++    return $RC
++}
++
++stop()
++{
++    echo -n "Stopping ibacm daemon:"
++
++    killproc -p $pidfile $prog
++    RC=$?
++    rm -f $subsys
++    echo
++    return $RC
++}
++
++status()
++{
++    if [ ! -f $subsys -a ! -f $pidfile ]; then
++      return 3
++    fi
++    if [ -f $pidfile ]; then
++      checkpid `cat $pidfile`
++      return $?
++    fi
++    if [ -f $subsys ]; then
++      return 2
++    fi
++}
++
++restart ()
++{
++    stop
++    start
++}
++
++condrestart ()
++{
++    [ -e $subsys ] && restart || return 0
++}
++
++usage ()
++{
++    echo
++    echo "Usage: `basename $0` {start|stop|restart|condrestart|try-restart|force-reload|status}"
++    echo
++    return 2
++}
++
++case $1 in
++    start|stop|restart|condrestart|try-restart|force-reload)
++      [ `id -u` != "0" ] && exit 4 ;;
++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=$? ;;
++esac
++
++exit $RC
+diff --git a/ibacm.spec.in b/ibacm.spec.in
+index ac7f06f..b9d73d2 100644
+--- a/ibacm.spec.in
++++ b/ibacm.spec.in
+@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ 
+ BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
+ Requires(post): chkconfig
+-Requiers(preun): chkconfig
++Requires(preun): chkconfig
+ ExcludeArch: s390, s390x
+ 
+ %description

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 94e44d4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,128 +0,0 @@
-Bottom: b7ef43780109283b77986862aa8504222eb78bce
-Top:    a3cb4424d2de12c0dffe8f97350084a997801ace
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-03-22 10:27:18 -0700
-
-Refresh of init-script
-
----
-
-diff --git a/ibacm.init b/ibacm.init
-new file mode 100644
-index 0000000..14588a1
---- /dev/null
-+++ b/ibacm.init
-@@ -0,0 +1,100 @@
-+#!/bin/bash
-+#
-+# Bring up/down the ibacm daemon
-+#
-+# chkconfig: 2345 25 75
-+# description: Starts/Stops InfiniBand ACM service
-+#
-+### BEGIN INIT INFO
-+# Provides:       ibacm
-+# Default-Start: 2 3 4 5
-+# Default-Stop: 0 1 6
-+# Required-Start: rdma $network
-+# Required-Stop: rdma $network
-+# Should-Start: opensm
-+# Should-Stop: opensm
-+# Short-Description: Starts and stops the InfiniBand ACM service
-+# Description: The InfiniBand ACM service provides a user space implementation
-+#     of someting resembling an ARP cache for InfiniBand SA queries and
-+#     host route lookups.
-+### END INIT INFO
-+
-+pidfile=/var/run/ibacm.pid
-+subsys=/var/lock/subsys/ibacm
-+prog=/usr/sbin/ibacm
-+
-+. /etc/rc.d/init.d/functions
-+
-+start()
-+{
-+    echo -n "Starting ibacm daemon:"
-+
-+    daemon $prog
-+    RC=$?
-+    [ $RC -eq 0 ] && touch $subsys
-+    echo
-+    return $RC
-+}
-+
-+stop()
-+{
-+    echo -n "Stopping ibacm daemon:"
-+
-+    killproc -p $pidfile $prog
-+    RC=$?
-+    rm -f $subsys
-+    echo
-+    return $RC
-+}
-+
-+status()
-+{
-+    if [ ! -f $subsys -a ! -f $pidfile ]; then
-+      return 3
-+    fi
-+    if [ -f $pidfile ]; then
-+      checkpid `cat $pidfile`
-+      return $?
-+    fi
-+    if [ -f $subsys ]; then
-+      return 2
-+    fi
-+}
-+
-+restart ()
-+{
-+    stop
-+    start
-+}
-+
-+condrestart ()
-+{
-+    [ -e $subsys ] && restart || return 0
-+}
-+
-+usage ()
-+{
-+    echo
-+    echo "Usage: `basename $0` {start|stop|restart|condrestart|try-restart|force-reload|status}"
-+    echo
-+    return 2
-+}
-+
-+case $1 in
-+    start|stop|restart|condrestart|try-restart|force-reload)
-+      [ `id -u` != "0" ] && exit 4 ;;
-+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=$? ;;
-+esac
-+
-+exit $RC
-diff --git a/ibacm.spec.in b/ibacm.spec.in
-index ac7f06f..b9d73d2 100644
---- a/ibacm.spec.in
-+++ b/ibacm.spec.in
-@@ -13,7 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
- 
- BuildRequires: libibverbs-devel >= 1.1-1, autoconf, libtool, libibumad-devel
- Requires(post): chkconfig
--Requiers(preun): chkconfig
-+Requires(preun): chkconfig
- ExcludeArch: s390, s390x
- 
- %description