From 6394d149761cd019e0847e30096089e78138dedd Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Thu, 30 Jun 2011 11:27:27 -0700
Subject: [PATCH] refresh

---
 meta                                   |  7 +++----
 patches/ibacm-run-as-daemon-by-default | 15 ++++++++++++++-
 patches/refresh-temp                   | 22 ----------------------
 3 files changed, 17 insertions(+), 27 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index ea82a6e..61a2770 100644
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: e10733aecb22ca6be26e8bf927e6063afa7eccba
-Head: 94b8e42ea95f88be20e27788d4330cf71381ddca
+Previous: fb3d31f32ad147e021808b4c2da6b3231388a60b
+Head: eb1881bd3740d99b9492d9e8d4fa5666cfb3931b
 Applied:
-  ibacm-run-as-daemon-by-default: 3eb8f395f9a52f04c5b408812e743566e6d673fe
-  refresh-temp: 94b8e42ea95f88be20e27788d4330cf71381ddca
+  ibacm-run-as-daemon-by-default: eb1881bd3740d99b9492d9e8d4fa5666cfb3931b
 Unapplied:
   fixup-starting-curly-brace-ali: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: b491f82e1c52dd1da5e568782b5fed4e58f1f19e
diff --git a/patches/ibacm-run-as-daemon-by-default b/patches/ibacm-run-as-daemon-by-default
index 9bc27dc..f0c16e7 100644
--- a/patches/ibacm-run-as-daemon-by-default
+++ b/patches/ibacm-run-as-daemon-by-default
@@ -1,5 +1,5 @@
 Bottom: e8b5bb1cf92f403d8767fc1d61cb8c538da64fe3
-Top:    c20b3d52fc6f2174569f4497060aa6dce8bb0b86
+Top:    291e865141371dd166944d40cde7ecb21151f2e0
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:19:57 -0700
 
@@ -12,6 +12,19 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/man/ib_acm.1 b/man/ib_acm.1
+index acf6a1d..af57d0b 100644
+--- a/man/ib_acm.1
++++ b/man/ib_acm.1
+@@ -38,7 +38,7 @@ These steps assume that the user has administrative privileges.
+ .P
+ 2. Install the IB ACM package.  This installs ib_acm, and ib_acme.
+ .P
+-3. Run 'ib_acm -D' as administrator to start the ib_acm daemon.
++3. Run 'ib_acm' as administrator to start the ib_acm daemon.
+ .P
+ 4. Optionally, run 'ib_acme -d <dest_ip> -v' to verify that
+ the ib_acm service is running.
 diff --git a/src/acm.c b/src/acm.c
 index 53a8e7b..210fd30 100644
 --- a/src/acm.c
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 9d8dfc3..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: c20b3d52fc6f2174569f4497060aa6dce8bb0b86
-Top:    291e865141371dd166944d40cde7ecb21151f2e0
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 11:27:26 -0700
-
-Refresh of ibacm-run-as-daemon-by-default
-
----
-
-diff --git a/man/ib_acm.1 b/man/ib_acm.1
-index acf6a1d..af57d0b 100644
---- a/man/ib_acm.1
-+++ b/man/ib_acm.1
-@@ -38,7 +38,7 @@ These steps assume that the user has administrative privileges.
- .P
- 2. Install the IB ACM package.  This installs ib_acm, and ib_acme.
- .P
--3. Run 'ib_acm -D' as administrator to start the ib_acm daemon.
-+3. Run 'ib_acm' as administrator to start the ib_acm daemon.
- .P
- 4. Optionally, run 'ib_acme -d <dest_ip> -v' to verify that
- the ib_acm service is running.
-- 
2.46.0