Version: 1
-Previous: 25d752692431adc65b373fae58751bf86caddcf8
-Head: 582e07c7a9768504631c13448ae1a42716020bd9
+Previous: 9fd2de4b3dd150f6ec00111f5e0c66fb8f1b9c7d
+Head: 9bb8de8ab4a072470d6d17bbde7de89fee3a475b
Applied:
mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9
af_ib: c366c39d4afc939932efc2f5158ae332161369bf
typo: 07e4480ebb4d54a02271b6935bf60ea1f45aab86
ipv4: ee6aa496369bc10e9975aa1e013445050a1c4510
err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38
- daemonize: 255d47dca45e63bb63c12404e3d4c83e89f0d312
- refresh-temp: 582e07c7a9768504631c13448ae1a42716020bd9
+ daemonize: 9bb8de8ab4a072470d6d17bbde7de89fee3a475b
Unapplied:
rel-1.0.6: 608e41bbbc2d4eb8d0a8e16573e819bd260adf65
dev-name2ip: 8e00708e882239292492e13aa51c82042255933c
Bottom: 24a3b4db7b7d119659eba135566a3dbefcec2589
-Top: 8bb74c3ec8358d50c3b737180e8f3f97fc5a012e
+Top: c46ab6059b0073d98d5ca1e32bce9f872677e6cc
Author: Sean Hefty <sean.hefty@intel.com>
Date: 2012-03-30 16:31:08 -0700
---
diff --git a/Makefile.am b/Makefile.am
-index 503ad72..c5efa7c 100644
+index 503ad72..696aa90 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,12 @@
INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
-AM_CFLAGS = -g -Wall -D_GNU_SOURCE
-+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"${rdmadir}\"
++AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"$(rdmadir)\"
bin_PROGRAMS = util/ib_acme
-sbin_PROGRAMS = svc/ib_acm
AC_OUTPUT\r
diff --git a/ibacm.init.in b/ibacm.init.in
new file mode 100644
-index 0000000..e28c213
+index 0000000..d8c34d5
--- /dev/null
+++ b/ibacm.init.in
@@ -0,0 +1,99 @@
+{
+ echo -n "Starting ibacm daemon:"
+
-+ daemon %sbindir%/ibacm
++ daemon %{_sbindir}/ibacm
+ RC=$?
+ [ $RC -eq 0 ] && touch $subsys
+ echo
+++ /dev/null
-Bottom: 8bb74c3ec8358d50c3b737180e8f3f97fc5a012e
-Top: c46ab6059b0073d98d5ca1e32bce9f872677e6cc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date: 2012-04-05 17:20:38 -0700
-
-Refresh of daemonize
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index c5efa7c..696aa90 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
-
--AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"${sysconfdir}\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"${rdmadir}\"
-+AM_CFLAGS = -g -Wall -D_GNU_SOURCE -DSYSCONFDIR=\"$(sysconfdir)\" -DBINDIR=\"$(bindir)\" -DRDMADIR=\"$(rdmadir)\"
-
- bin_PROGRAMS = util/ib_acme
- sbin_PROGRAMS = svc/ibacm
-diff --git a/ibacm.init.in b/ibacm.init.in
-index e28c213..d8c34d5 100644
---- a/ibacm.init.in
-+++ b/ibacm.init.in
-@@ -28,7 +28,7 @@ start()
- {
- echo -n "Starting ibacm daemon:"
-
-- daemon %sbindir%/ibacm
-+ daemon %{_sbindir}/ibacm
- RC=$?
- [ $RC -eq 0 ] && touch $subsys
- echo