Author: adrian.chadd
Date: Sat May 2 21:28:01 2009
New Revision: 14026
Modified:
branches/LUSCA_HEAD/src/Makefile.am
branches/LUSCA_HEAD/src/cf.data.pre
branches/LUSCA_HEAD/src/structs.h
branches/LUSCA_HEAD/tools/Makefile.am
Log:
Include the ufs_log_build program in the base configuration and build;
it now gets installed in libexec/ and not bin/.
The program is not yet used by the AUFS rebuild code (spawned, used, etc) -
it is simply linked into the config.
Modified: branches/LUSCA_HEAD/src/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/src/Makefile.am (original)
+++ branches/LUSCA_HEAD/src/Makefile.am Sat May 2 21:28:01 2009
@@ -351,6 +351,7 @@
DEFAULT_UNLINKD = $(libexecdir)/`echo unlinkd |
sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_DISKD = $(libexecdir)/`echo diskd-daemon |
sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_LOGFILED = $(libexecdir)/`echo logfile-daemon |
sed '$(transform);s/$$/$(EXEEXT)/'`
+DEFAULT_UFS_LOG_BUILD = $(libexecdir)/`echo ufs_log_build |
sed '$(transform);s/$$/$(EXEEXT)/'`
DEFAULT_ICON_DIR = $(datadir)/icons
DEFAULT_ERROR_DIR = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
DEFAULT_MIB_PATH = $(datadir)/mib.txt
@@ -399,6 +400,7 @@
s...@default_unlinkd@%$(DEFAULT_UNLINKD)%g;\
s...@default_pinger@%$(DEFAULT_PINGER)%g;\
s...@default_diskd@%$(DEFAULT_DISKD)%g;\
+ s...@default_ufs_log_build@%$(DEFAULT_UFS_LOG_BUILD)%g;\
s...@default_logfiled@%$(DEFAULT_LOGFILED)%g;\
s...@default_cache_log@%$(DEFAULT_CACHE_LOG)%g;\
s...@default_access_log@%$(DEFAULT_ACCESS_LOG)%g;\
Modified: branches/LUSCA_HEAD/src/cf.data.pre
==============================================================================
--- branches/LUSCA_HEAD/src/cf.data.pre (original)
+++ branches/LUSCA_HEAD/src/cf.data.pre Sat May 2 21:28:01 2009
@@ -2688,6 +2688,16 @@
-----------------------------------------------------------------------------
COMMENT_END
+NAME: ufs_log_build_program
+TYPE: string
+DEFAULT: @DEFAULT_UFS_LOG_BUILD@
+LOC: Config.Program.ufs_log_build
+DOC_START
+ Specify the location of the UFS directory rebuild program.
+ This program runs as a helper to build a UFS swap log from
+ the directory contents.
+DOC_END
+
NAME: diskd_program
TYPE: string
DEFAULT: @DEFAULT_DISKD@
Modified: branches/LUSCA_HEAD/src/structs.h
==============================================================================
--- branches/LUSCA_HEAD/src/structs.h (original)
+++ branches/LUSCA_HEAD/src/structs.h Sat May 2 21:28:01 2009
@@ -547,6 +547,7 @@
char *unlinkd;
#endif
char *diskd;
+ char *ufs_log_build;
#if USE_SSL
char *ssl_password;
#endif
Modified: branches/LUSCA_HEAD/tools/Makefile.am
==============================================================================
--- branches/LUSCA_HEAD/tools/Makefile.am (original)
+++ branches/LUSCA_HEAD/tools/Makefile.am Sat May 2 21:28:01 2009
@@ -24,11 +24,11 @@
bin_PROGRAMS = \
squidclient \
- ufs_log_build \
ufs_log_dump \
$(COSSDUMP)
libexec_PROGRAMS = \
+ ufs_log_build \
cachemgr$(CGIEXT)
squidclient_SOURCES = squidclient.c
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"lusca-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/lusca-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
