From f388d0d36b5db51bae7906ad028f609a5b02b668 Mon Sep 17 00:00:00 2001 From: "sean.hefty@intel.com" Date: Tue, 3 Apr 2012 17:20:52 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/daemonize | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/meta b/meta index 2c0084c..106a91b 100644 --- a/meta +++ b/meta @@ -1,11 +1,11 @@ Version: 1 -Previous: ac679dce35b0ade05ebf328f0a75f2750cbff467 -Head: f14184051293bfceac4f04e46efcf2f329a42aff +Previous: 90d3b1680705e6578d640067f1c0f4ee0248e1d2 +Head: 88f657dfa31019f896f6b094f3b638b0f30cd6b5 Applied: mc-refcnt: 4f23053ab33fa519a16374f0b9273ca04798b56a af_ib: f14184051293bfceac4f04e46efcf2f329a42aff + daemonize: 88f657dfa31019f896f6b094f3b638b0f30cd6b5 Unapplied: - daemonize: fa67959cf1b176ad53b6feaa446cf284c37bd87c rel-1.0.6: 61af43c5cc2b40893ea9ff555020c137366773cd dev-name2ip: 8e00708e882239292492e13aa51c82042255933c dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a diff --git a/patches/daemonize b/patches/daemonize index a969981..1bff2c3 100644 --- a/patches/daemonize +++ b/patches/daemonize @@ -1,5 +1,5 @@ -Bottom: 163f50499aea8749e94a5c93c4939e5f74ae1906 -Top: 5845b20997dda75dd9baf21235ec37582f2e3321 +Bottom: e08db13f657dd29e1d20ddd6d5e6e9d8d4abbc75 +Top: 64eb4bbb6a011761491e6306489418b652e38bd6 Author: Sean Hefty Date: 2012-03-30 16:31:08 -0700 @@ -565,7 +565,7 @@ index f26ffb8..c0c63fc 100644 -ib_acme(1), ib_acm(1) +ib_acme(1), ibacm(1) diff --git a/src/acm.c b/src/acm.c -index 906c926..4e90e8c 100644 +index 6089785..8b5ff43 100644 --- a/src/acm.c +++ b/src/acm.c @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER]; @@ -584,7 +584,7 @@ index 906c926..4e90e8c 100644 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; -@@ -2507,9 +2508,9 @@ static FILE *acm_open_addr_file(void) +@@ -2508,9 +2509,9 @@ static FILE *acm_open_addr_file(void) if ((f = fopen(addr_file, "r"))) return f; @@ -597,7 +597,7 @@ index 906c926..4e90e8c 100644 return NULL; } pclose(f); -@@ -3156,9 +3157,9 @@ static void show_usage(char *program) +@@ -3157,9 +3158,9 @@ static void show_usage(char *program) printf(" [-D] - run as a daemon (default)\n"); printf(" [-P] - run as a standard process\n"); printf(" [-A addr_file] - address configuration file\n"); -- 2.41.0