refresh

diff --git a/meta b/meta
index 6bb74dd650c483fd048e8a1873fc1dd37a30bf6c..bcc86d64bdb3411adc97378cdb49ecb8cafc90c9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 7e81bb552cc8e4f660eafe06c23cbb580c8e5e93
-Head: 8b85817d539b7a05e5ddab590e322eca1a670a2d
+Previous: 83605afcc6c3fa3c392ae91eb15320b5014b25fd
+Head: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Applied:
   typo: e733d04dcaf637e600b3f1873befa4e8eaef4f83
   daemon: 7b29fa2e46e60f2cec734b59f7efe8cdeec59660
   cfg: 66af10c14df1055d97422bc056dc0897ac3a2773
-  log: 5c2ee180bbae2240851795a57be34a6d8d4cd4e0
-  refresh-temp: 8b85817d539b7a05e5ddab590e322eca1a670a2d
+  log: cbe50bfc0ec5aa61f08083722d2b3d53791195a9
 Unapplied:
 Hidden:

diff --git a/patches/log b/patches/log
index d04fc6ff36495b83b619bbdc5364a18c8c92eaf8..1640f679a6fa5dcaa8c54a5595c68f6f492cd45b 100644 (file)
--- a/patches/log
+++ b/patches/log
@@ -1,5 +1,5 @@
 Bottom: a9a7ff03d17186f855af81adb232170085e921d9
-Top:    771097925f08dc918e0aa61f53943911d30ccd0e
+Top:    5eb5beda6d0737d1fbf28c45ce124587a185a91a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-07-28 16:35:30 -0700
 
@@ -15,7 +15,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 diff --git a/acm_opts.cfg b/acm_opts.cfg
 old mode 100644
 new mode 100755
-index 95ac15a..3e3a4a0
+index 95ac15a..52a362f
 --- a/acm_opts.cfg
 +++ b/acm_opts.cfg
 @@ -15,9 +15,9 @@
@@ -23,10 +23,10 @@ index 95ac15a..3e3a4a0
  # log_file stdout\r
  # log_file stderr\r
 -# log_file /tmp/acm_\r
-+# log_file /var/log/acm_\r
++# log_file /var/log/ibacm_\r
  \r
 -log_file acm_\r
-+log_file /var/log/acm_\r
++log_file /var/log/ibacm_\r
  \r
  # log_level:\r
  # Indicates the amount of detailed data written to the log file.  Log levels\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 85422f9..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,25 +0,0 @@
-Bottom: 771097925f08dc918e0aa61f53943911d30ccd0e
-Top:    5eb5beda6d0737d1fbf28c45ce124587a185a91a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-07-28 16:41:59 -0700
-
-Refresh of log
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 3e3a4a0..52a362f 100755
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -15,9 +15,9 @@
- # Examples:\r
- # log_file stdout\r
- # log_file stderr\r
--# log_file /var/log/acm_\r
-+# log_file /var/log/ibacm_\r
- \r
--log_file /var/log/acm_\r
-+log_file /var/log/ibacm_\r
- \r
- # log_level:\r
- # Indicates the amount of detailed data written to the log file.  Log levels