From 21d68b031df82c3283996c9c77c9d4768e0ff86d Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 6 Apr 2012 08:15:56 -0700 Subject: [PATCH] pop --- meta | 6 +++--- patches/daemonize | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta b/meta index 586d10b..af77c69 100644 --- a/meta +++ b/meta @@ -1,6 +1,6 @@ Version: 1 -Previous: d712b1b4998a696debede8f957f0013bef8bd2f2 -Head: 182179552116698d6624f7bcb2d2cd48dc3bccce +Previous: 5e754b11fda39b66f0b8f467b493e783f657b68c +Head: 9b02e3338cd29d27362445e8021ac69126ad0063 Applied: mc-refcnt: c7d28b35d64333c262de3ec972c426423dadccf9 af_ib: c366c39d4afc939932efc2f5158ae332161369bf @@ -9,8 +9,8 @@ Applied: err-resolve-gid: b05ca7c6f1bbced527ed02a9d7cd25a28bf8bf38 lid: d0bffbd0765be6a31be97aee1a336681c49e4d99 def-route: 182179552116698d6624f7bcb2d2cd48dc3bccce + daemonize: 9b02e3338cd29d27362445e8021ac69126ad0063 Unapplied: - daemonize: 94e0f52806e52e9a441f25cb3bc30bebacd2e1d1 rel-1.0.6: 5028b5c72ed397df42c3ac53263914025f6c2d86 dev-name2ip: 8e00708e882239292492e13aa51c82042255933c dev-addrsize: 8de02c47fbf595132105a7050ad6f755f49f9a7a diff --git a/patches/daemonize b/patches/daemonize index 83f6eca..74ea7b0 100644 --- a/patches/daemonize +++ b/patches/daemonize @@ -1,5 +1,5 @@ -Bottom: aa257fb159401d03e22d6da8501895fe34e69bed -Top: 6334ead260a5f39e453ccbed375f18d4719a9a45 +Bottom: 76bbe9d40be7ab8454df1b55243a5ce561520165 +Top: d00482d54ccce5e8d5f09deda97e7d2fbe4040f3 Author: Sean Hefty Date: 2012-03-30 16:31:08 -0700 @@ -620,7 +620,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 5041b1c..9d2361e 100644 +index b47ee8a..099e84e 100644 --- a/src/acm.c +++ b/src/acm.c @@ -205,11 +205,12 @@ static atomic_t counter[ACM_MAX_COUNTER]; @@ -637,7 +637,7 @@ index 5041b1c..9d2361e 100644 -static char lock_file[128] = "/var/lock/ibacm.pid"; +static char lock_file[128] = "/var/run/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_route_prot route_prot = ACM_ROUTE_PROT_SA; static enum acm_loopback_prot loopback_prot = ACM_LOOPBACK_PROT_LOCAL; @@ -2508,9 +2509,9 @@ static FILE *acm_open_addr_file(void) if ((f = fopen(addr_file, "r"))) -- 2.46.0