refresh

diff --git a/meta b/meta
index 8a3be7ff394186ab1bc65b83f204ae4f08dcf2e3..cbfe1cce1fc87b803d10029e9772231f73fab49c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 89123f82891dba5d694ba8abd2888062d645d5b8
-Head: 02ded227085d0f37b04d820c15515bf7cd3aa51d
+Previous: 7358ca604efdcd9bb97d06f12612664b0163c0af
+Head: 71662d42422a3a8d731881f49299eadbef822155
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -8,8 +8,7 @@ Applied:
   fix-text: 6d9535384c392e24b6820e6de50112b39883fe56
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
-  locking: d395579d92ca45f4e7bf3a9f677989665c1a5345
-  refresh-temp: 02ded227085d0f37b04d820c15515bf7cd3aa51d
+  locking: 71662d42422a3a8d731881f49299eadbef822155
 Unapplied:
   1.0.4: db24cd6696165aaa0710030188e77be4d6b4cbfd
 Hidden:

diff --git a/patches/locking b/patches/locking
index af0b0288b2fdbbc7c7cdeb51fe7e3d0a97b91a5b..155937a8b4add7f4a8543871f39ce123eddd3f40 100644 (file)
--- a/patches/locking
+++ b/patches/locking
@@ -1,5 +1,5 @@
 Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    1ac64e1267b46288459f8b4a25aeb893b3d48cba
+Top:    96f11407eaab70a2bc9b744e5a62aadf2f3e2eeb
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-02 14:12:56 -0800
 
@@ -13,4 +13,66 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/acm_opts.cfg b/acm_opts.cfg
+index 372cd7b..7147fe2 100644
+--- a/acm_opts.cfg
++++ b/acm_opts.cfg
+@@ -26,6 +26,12 @@ log_file /var/log/ibacm.log
+ \r
+ log_level 0\r
+ \r
++# lock_file:\r
++# Specifies the location of the ACM lock file used to ensure that only a\r
++# single instance of ACM is running.\r
++\r
++lock_file /var/lock/ibacm.pid\r
++\r
+ # addr_prot:\r
+ # Default resolution protocol to resolve IP addresses into IB GIDs.\r
+ # Supported protocols are:\r
+diff --git a/src/acm.c b/src/acm.c
+index 3152392..7275a98 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -208,6 +208,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
+ static char *addr_file = "/etc/ibacm/acm_addr.cfg";
+ static char log_file[128] = "stdout";
+ static int log_level = 0;
++static char lock_file[128] = "/var/log/ibacm.pid";
+ static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
+ static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
+ static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
+@@ -2654,6 +2655,8 @@ static void acm_set_options(void)
+                       strcpy(log_file, value);
+               else if (!stricmp("log_level", opt))
+                       log_level = atoi(value);
++              else if (!stricmp("lock_file", opt))
++                      strcpy(lock_file, value);
+               else if (!stricmp("addr_prot", opt))
+                       addr_prot = acm_convert_addr_prot(value);
+               else if (!stricmp("route_prot", opt))
+@@ -2686,6 +2689,7 @@ static void acm_set_options(void)
+ static void acm_log_options(void)
+ {
+       acm_log(0, "log level %d\n", log_level);
++      acm_log(0, "lock file %s\n", lock_file);
+       acm_log(0, "address resolution %d\n", addr_prot);
+       acm_log(0, "route resolution %d\n", route_prot);
+       acm_log(0, "loopback resolution %d\n", loopback_prot);
+diff --git a/src/acme.c b/src/acme.c
+index 218dbe8..552f42a 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -106,6 +106,12 @@ static void gen_opts_temp(FILE *f)
+       fprintf(f, "\n");
+       fprintf(f, "log_level 0\n");
+       fprintf(f, "\n");
++      fprintf(f, "# lock_file:\n");
++      fprintf(f, "# Specifies the location of the ACM lock file used to ensure that only a\n");
++      fprintf(f, "# single instance of ACM is running.\n");
++      fprintf(f, "\n");
++      fprintf(f, "lock_file /var/lock/ibacm.pid\n");
++      fprintf(f, "\n");
+       fprintf(f, "# addr_prot:\n");
+       fprintf(f, "# Default resolution protocol to resolve IP addresses into IB GIDs.\n");
+       fprintf(f, "# Supported protocols are:\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7c285d6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,72 +0,0 @@
-Bottom: 1ac64e1267b46288459f8b4a25aeb893b3d48cba
-Top:    96f11407eaab70a2bc9b744e5a62aadf2f3e2eeb
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-02 14:26:04 -0800
-
-Refresh of locking
-
----
-
-diff --git a/acm_opts.cfg b/acm_opts.cfg
-index 372cd7b..7147fe2 100644
---- a/acm_opts.cfg
-+++ b/acm_opts.cfg
-@@ -26,6 +26,12 @@ log_file /var/log/ibacm.log
- \r
- log_level 0\r
- \r
-+# lock_file:\r
-+# Specifies the location of the ACM lock file used to ensure that only a\r
-+# single instance of ACM is running.\r
-+\r
-+lock_file /var/lock/ibacm.pid\r
-+\r
- # addr_prot:\r
- # Default resolution protocol to resolve IP addresses into IB GIDs.\r
- # Supported protocols are:\r
-diff --git a/src/acm.c b/src/acm.c
-index 3152392..7275a98 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -208,6 +208,7 @@ static char *opts_file = "/etc/ibacm/acm_opts.cfg";
- static char *addr_file = "/etc/ibacm/acm_addr.cfg";
- static char log_file[128] = "stdout";
- static int log_level = 0;
-+static char lock_file[128] = "/var/log/ibacm.pid";
- static enum acm_addr_prot addr_prot = ACM_ADDR_PROT_ACM;
- static enum acm_route_prot route_prot = ACM_ROUTE_PROT_ACM;
- static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL;
-@@ -2654,6 +2655,8 @@ static void acm_set_options(void)
-                       strcpy(log_file, value);
-               else if (!stricmp("log_level", opt))
-                       log_level = atoi(value);
-+              else if (!stricmp("lock_file", opt))
-+                      strcpy(lock_file, value);
-               else if (!stricmp("addr_prot", opt))
-                       addr_prot = acm_convert_addr_prot(value);
-               else if (!stricmp("route_prot", opt))
-@@ -2686,6 +2689,7 @@ static void acm_set_options(void)
- static void acm_log_options(void)
- {
-       acm_log(0, "log level %d\n", log_level);
-+      acm_log(0, "lock file %s\n", lock_file);
-       acm_log(0, "address resolution %d\n", addr_prot);
-       acm_log(0, "route resolution %d\n", route_prot);
-       acm_log(0, "loopback resolution %d\n", loopback_prot);
-diff --git a/src/acme.c b/src/acme.c
-index 218dbe8..552f42a 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -106,6 +106,12 @@ static void gen_opts_temp(FILE *f)
-       fprintf(f, "\n");
-       fprintf(f, "log_level 0\n");
-       fprintf(f, "\n");
-+      fprintf(f, "# lock_file:\n");
-+      fprintf(f, "# Specifies the location of the ACM lock file used to ensure that only a\n");
-+      fprintf(f, "# single instance of ACM is running.\n");
-+      fprintf(f, "\n");
-+      fprintf(f, "lock_file /var/lock/ibacm.pid\n");
-+      fprintf(f, "\n");
-       fprintf(f, "# addr_prot:\n");
-       fprintf(f, "# Default resolution protocol to resolve IP addresses into IB GIDs.\n");
-       fprintf(f, "# Supported protocols are:\n");