Re: diskd

On Wed, 10 Jan 2001, Henrik Nordstrom wrote:

> diskd should not go into /usr/bin. It is an internal program not
> intended to be run outside Squid. Most distributions I have seen puts
> such things in /usr/libexec/squid/, /usr/lib/squid/ or a similar
> location out of the normal bin directories.

This patch puts unlinkd, diskd, and cachemgr.cgi into $prefix/libexec/squid/

Any problems with it?

Index: configure.in
===================================================================
RCS file: /squid/squid/configure.in,v
retrieving revision 1.212
diff -u -r1.212 configure.in
--- configure.in 2001/01/07 23:36:27 1.212
+++ configure.in 2001/01/11 00:08:39
@@ -22,9 +22,8 @@
 dnl use directory structure of cached as default (hack)
 if test "$libexecdir" = '${exec_prefix}/libexec' &&
    test "$localstatedir" = '${prefix}/var'; then
- libexecdir='${bindir}'
+ libexecdir='${prefix}/libexec/squid'
        localstatedir='${prefix}'
-
 fi

 dnl use .exe suffix for executables on cygwin32 platform
Index: src/Makefile.in
===================================================================
RCS file: /squid/squid/src/Makefile.in,v
retrieving revision 1.196
diff -u -r1.196 Makefile.in
--- src/Makefile.in 2001/01/07 23:36:37 1.196
+++ src/Makefile.in 2001/01/11 00:08:40
@@ -323,8 +323,8 @@
                mkdir $(bindir); \
        fi
        -@if test ! -d $(libexecdir); then \
- echo "mkdir $(libexecdir)"; \
- mkdir $(libexecdir); \
+ echo "mkdir -p $(libexecdir)"; \
+ mkdir -p $(libexecdir); \
        fi
        -@if test ! -d $(sysconfdir); then \
                echo "mkdir $(sysconfdir)"; \
Index: src/fs/diskd/store_dir_diskd.c
===================================================================
RCS file: /squid/squid/src/fs/diskd/store_dir_diskd.c,v
retrieving revision 1.34
diff -u -r1.34 store_dir_diskd.c
--- src/fs/diskd/store_dir_diskd.c 2001/01/09 00:18:46 1.34
+++ src/fs/diskd/store_dir_diskd.c 2001/01/11 00:08:42
@@ -415,7 +415,7 @@
 #else
     x = ipcCreate(IPC_FIFO,
 #endif
- SQUID_PREFIX "/bin/diskd",
+ SQUID_PREFIX "/libexec/squid/diskd",
        args,
        "diskd",
        &rfd,
Received on Wed Jan 10 2001 - 17:10:46 MST