refresh

diff --git a/meta b/meta
index 53cd806597847f37bbb1719b1fb49e82ad83544b..86eff88e76a1923c1a4087c1a2b3fcae0ccbdafb 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 76737f664eb41a8988ced0e01a542ba22d80a38c
-Head: 8b1ad27ed9e1e578fbc3522677b9689b7fcdda37
+Previous: 86a0d6f3dac409470c1f5b9e4e25b718e48c5ea5
+Head: ba931a40530d6840893b686a6ed817ff9c4b15af
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -11,8 +11,7 @@ Applied:
   locking: 558e5577364aec3531c54b28def6e16f0c926524
   verbose: 15cf7a7a260a694923bcb5c9181b10b0f02108f7
   dbg_1: 0b650c149079cd8e1593504492a9940521fb9c6d
-  no_addr: 45d0dbe31df5f9be4ecdb6db28e050537c97dd31
-  refresh-temp: 8b1ad27ed9e1e578fbc3522677b9689b7fcdda37
+  no_addr: ba931a40530d6840893b686a6ed817ff9c4b15af
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/no_addr b/patches/no_addr
index e03e12eef09bf60b4b566b0b52cc83f17ba7228c..f72b22b5916c23245bbb98f8222ad5243347fd37 100644 (file)
--- a/patches/no_addr
+++ b/patches/no_addr
@@ -3,10 +3,13 @@ Top:    a307944fa3171b48a0b7c8ad9cb0218ce45d24c2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-06 11:06:47 -0800
 
-ibacm: exit if no endpoints are active
+ibacm: automatically generate addresses if missing acm_addr.cfg
 
-Exit the service if no endpoints can be found to activate.  This
-may be caused by a missing address configuration file.
+If the acm_addr.cfg file is missing, automatically attempt to
+generate the file.  If no addresses can be assigned to any
+endpoints because of a missing file, log an error and exit
+the service.  This avoids running a service that is basically
+useless.
 
 Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index fcc4ec4..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,10 +0,0 @@
-Bottom: a307944fa3171b48a0b7c8ad9cb0218ce45d24c2
-Top:    a307944fa3171b48a0b7c8ad9cb0218ce45d24c2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-06 11:27:43 -0800
-
-Refresh of no_addr
-
----
-
-