public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: cluster: master - build: remove last hardencoded bits for /var/run Date: Fri, 29 May 2009 19:06:00 -0000 [thread overview] Message-ID: <20090529190616.57B5512020D@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=5c0fbc4d1d49ea92906c501a4e9eccd171d0f598 Commit: 5c0fbc4d1d49ea92906c501a4e9eccd171d0f598 Parent: 3f1073b74b4972c63155323f6a94fbfcd91f98c8 Author: Fabio M. Di Nitto <fdinitto@redhat.com> AuthorDate: Fri May 29 21:05:14 2009 +0200 Committer: Fabio M. Di Nitto <fdinitto@redhat.com> CommitterDate: Fri May 29 21:05:14 2009 +0200 build: remove last hardencoded bits for /var/run this also changes the default for our daemons to store their pid files in /var/run/cluster. Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com> --- cman/notifyd/main.c | 2 +- cman/qdisk/daemon_init.c | 2 +- cman/tests/sysman.c | 2 +- cman/tests/sysmand.c | 2 +- configure.ac | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cman/notifyd/main.c b/cman/notifyd/main.c index feaebb9..9795205 100644 --- a/cman/notifyd/main.c +++ b/cman/notifyd/main.c @@ -26,7 +26,7 @@ int daemon_quit = 0; cman_handle_t cman_handle; int rr = 0; -#define LOCKFILE_NAME "/var/run/cmannotifyd.pid" +#define LOCKFILE_NAME CLUSTERVARRUN "/cmannotifyd.pid" #define OPTION_STRING "hdfVr" diff --git a/cman/qdisk/daemon_init.c b/cman/qdisk/daemon_init.c index 46c2f7f..7b34db6 100644 --- a/cman/qdisk/daemon_init.c +++ b/cman/qdisk/daemon_init.c @@ -120,7 +120,7 @@ check_process_running(char *prog, pid_t * pid) memset(filename, 0, PATH_MAX); cmd = basename(prog); - snprintf(filename, sizeof (filename), "/var/run/%s.pid", cmd); + snprintf(filename, sizeof (filename), CLUSTERVARRUN "/%s.pid", cmd); ret = stat(filename, &st); if ((ret < 0) || (!st.st_size)) diff --git a/cman/tests/sysman.c b/cman/tests/sysman.c index afa8e8b..fac803b 100644 --- a/cman/tests/sysman.c +++ b/cman/tests/sysman.c @@ -17,7 +17,7 @@ #include <fcntl.h> #include <limits.h> -#define LOCAL_SOCKNAME "/var/run/sysman" +#define LOCAL_SOCKNAME CLUSTERVARRUN "/sysman" static int open_local_sock(void); int main(int argc, char *argv[]) diff --git a/cman/tests/sysmand.c b/cman/tests/sysmand.c index 112526d..70576d9 100644 --- a/cman/tests/sysmand.c +++ b/cman/tests/sysmand.c @@ -33,7 +33,7 @@ #include <limits.h> #include "libcman.h" -#define LOCAL_SOCKNAME "/var/run/sysman" +#define LOCAL_SOCKNAME CLUSTERVARRUN "/sysman" #define CLUSTER_PORT_SYSMAN 12 static cman_node_t *nodes = NULL; diff --git a/configure.ac b/configure.ac index 1710108..845883b 100644 --- a/configure.ac +++ b/configure.ac @@ -185,6 +185,8 @@ AC_SUBST([NOTIFYDDIR]) AC_SUBST([LOGROTATEDIR]) AC_SUBST([CLUSTERVARRUN]) +AC_DEFINE_UNQUOTED([CLUSTERVARRUN], "$(eval echo ${CLUSTERVARRUN)", + [Default cluster var/run directory]) AC_SUBST([CLUSTERVARLIB])
reply other threads:[~2009-05-29 19:06 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20090529190616.57B5512020D@lists.fedorahosted.org \ --to=fabbione@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).