diff --git a/iocore/cache/Store.cc b/iocore/cache/Store.cc index 442c948aa93..4788c4e305c 100644 --- a/iocore/cache/Store.cc +++ b/iocore/cache/Store.cc @@ -27,6 +27,7 @@ #include "ts/ink_file.h" #include "ts/Tokenizer.h" #include "ts/SimpleTokenizer.h" +#include "ts/runroot.h" #if HAVE_LINUX_MAJOR_H #include @@ -390,7 +391,12 @@ Store::read_config() } } - std::string pp = Layout::get()->relative(path); + std::string pp; + if (get_runroot().empty()) { + pp = Layout::get()->relative(path); + } else { + pp = Layout::get()->cachedir; + } ns = new Span; Debug("cache_init", "Store::read_config - ns = new Span; ns->init(\"%s\",%" PRId64 "), forced volume=%d%s%s", pp.c_str(), size, diff --git a/lib/records/RecConfigParse.cc b/lib/records/RecConfigParse.cc index b690375ac09..3bb9da704c0 100644 --- a/lib/records/RecConfigParse.cc +++ b/lib/records/RecConfigParse.cc @@ -91,8 +91,10 @@ RecConfigOverrideFromRunroot(const char *name) { if (!get_runroot().empty()) { if (!strcmp(name, "proxy.config.bin_path") || !strcmp(name, "proxy.config.local_state_dir") || - !strcmp(name, "proxy.config.log.logfile_dir") || !strcmp(name, "proxy.config.plugin.plugin_dir")) + !strcmp(name, "proxy.config.log.logfile_dir") || !strcmp(name, "proxy.config.plugin.plugin_dir") || + !strcmp(name, "proxy.config.hostdb.storage_path")) { return true; + } } return false; }