From edecda6cff1304fca4c47034b7064dcd51bcc33d Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 21 Dec 2009 11:26:05 -0500 Subject: PR 10247, 10276, 10905: Move remaining client/server tools to libexec. --- stap-server-connect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'stap-server-connect.c') diff --git a/stap-server-connect.c b/stap-server-connect.c index f70810a4..e063fd91 100644 --- a/stap-server-connect.c +++ b/stap-server-connect.c @@ -468,7 +468,7 @@ handle_connection(PRFileDesc *tcpSocket) #endif /* Call the stap-server script. */ - stap_server_prefix = getenv("SYSTEMTAP_SERVER_SCRIPTS") ?: BINDIR; + stap_server_prefix = getenv("SYSTEMTAP_SERVER_SCRIPTS") ?: PKGLIBDIR; cmdline = PORT_Alloc(strlen (stap_server_prefix) + sizeof ("/stap-server") + 1 + sizeof (requestFileName) + 1 + sizeof (responseDirName) + 1 + -- cgit From 600450900a5e98404c91104d2cb20cddce42838e Mon Sep 17 00:00:00 2001 From: Dave Brolley Date: Mon, 21 Dec 2009 19:26:16 -0500 Subject: PR 10905: initscript improvements. Make the stap-server initscript available as $bindir/stap-server Reimplement the stap-server initscript as a thin wrapper around $bindir/stap-server. --- stap-server-connect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stap-server-connect.c') diff --git a/stap-server-connect.c b/stap-server-connect.c index e063fd91..cf0e5a65 100644 --- a/stap-server-connect.c +++ b/stap-server-connect.c @@ -467,9 +467,9 @@ handle_connection(PRFileDesc *tcpSocket) } #endif - /* Call the stap-server script. */ + /* Call the stap-server-request script. */ stap_server_prefix = getenv("SYSTEMTAP_SERVER_SCRIPTS") ?: PKGLIBDIR; - cmdline = PORT_Alloc(strlen (stap_server_prefix) + sizeof ("/stap-server") + 1 + + cmdline = PORT_Alloc(strlen (stap_server_prefix) + sizeof ("/stap-server-request") + 1 + sizeof (requestFileName) + 1 + sizeof (responseDirName) + 1 + sizeof (responseZipName) + 1 + @@ -482,7 +482,7 @@ handle_connection(PRFileDesc *tcpSocket) goto cleanup; } - sprintf (cmdline, "%s/stap-server %s %s %s %s '%s'", stap_server_prefix, + sprintf (cmdline, "%s/stap-server-request %s %s %s %s '%s'", stap_server_prefix, requestFileName, responseDirName, responseZipName, dbdir, stapOptions); rc = system (cmdline); -- cgit