All of lore.kernel.org
 help / color / mirror / Atom feed
From: pcaulfield@sourceware.org <pcaulfield@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] cluster/cman/cman_tool Makefile join.c
Date: 3 Jul 2006 07:58:39 -0000	[thread overview]
Message-ID: <20060703075839.24373.qmail@sourceware.org> (raw)

CVSROOT:	/cvs/cluster
Module name:	cluster
Changes by:	pcaulfield at sourceware.org	2006-07-03 07:58:39

Modified files:
	cman/cman_tool : Makefile join.c 

Log message:
	Run aisexec from SBINDIR

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/Makefile.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/cman/cman_tool/join.c.diff?cvsroot=cluster&r1=1.45&r2=1.46

--- cluster/cman/cman_tool/Makefile	2006/06/12 21:58:12	1.14
+++ cluster/cman/cman_tool/Makefile	2006/07/03 07:58:39	1.15
@@ -18,7 +18,7 @@
 CFLAGS+= -g -I${ccsincdir} -I${incdir} -I${top_srcdir}/config \
 	-DCMAN_RELEASE_NAME=\"${RELEASE}\" -I../lib
 
-CFLAGS+=-DDEBUG
+CFLAGS+=-DDEBUG -fstack-protector -Wp,-D_FORTIFY_SOURCE=2
 
 TARGET=cman_tool
 
@@ -34,7 +34,7 @@
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 join.o: join.c cman_tool.h
-	$(CC) $(CFLAGS) -c -o $@ $< -DLIBEXECDIR=\"${libexecdir}/cman\"
+	$(CC) $(CFLAGS) -c -o $@ $< -DSBINDIR=\"${sbindir}/cman\"
 
 install: cman_tool
 	install -d ${sbindir}
--- cluster/cman/cman_tool/join.c	2006/05/10 14:20:06	1.45
+++ cluster/cman/cman_tool/join.c	2006/07/03 07:58:39	1.46
@@ -128,9 +128,9 @@
 
 	case 0: // child
 		be_daemon(!comline->verbose);
-		chdir(LIBEXECDIR);
+		chdir(SBINDIR);
 		execve("./aisexec", argv, envp);
-		die("execve of " LIBEXECDIR "/aisexec failed: %s", strerror(errno));
+		die("execve of " SBINDIR "/aisexec failed: %s", strerror(errno));
 		break;
 
 	default: //parent



                 reply	other threads:[~2006-07-03  7:58 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=20060703075839.24373.qmail@sourceware.org \
    --to=pcaulfield@sourceware.org \
    /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: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.