create and use underVespaHome

2 files changed, 4 insertions, 5 deletions

diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp
index 3ba5ba61fcd..3ab6d311d09 100644
--- a/storage/src/vespa/storage/storageserver/statemanager.cpp
+++ b/storage/src/vespa/storage/storageserver/statemanager.cpp
@@ -505,9 +505,8 @@ namespace {
         if (advanceCount) ++fileCounter;
         uint32_t fileIndex = fileCounter % 8;
         std::ostringstream fileName;
-        fileName << vespa::Defaults::vespaHome()
-                 << "/tmp/hostinfo." << pid << "." << fileIndex
-                 << ".report";
+        fileName << vespa::Defaults::underVespaHome("tmp/hostinfo")
+                 << "." << pid << "." << fileIndex << ".report";
         return fileName.str();
     }
 }
diff --git a/storage/src/vespa/storage/visiting/visitorlibraries.cpp b/storage/src/vespa/storage/visiting/visitorlibraries.cpp
index 2f13c16e42d..39dc49ddf10 100644
--- a/storage/src/vespa/storage/visiting/visitorlibraries.cpp
+++ b/storage/src/vespa/storage/visiting/visitorlibraries.cpp
@@ -29,8 +29,8 @@ VisitorLibraries::getLibrary(StorageServerInterface& storageServer, const std::s
     std::string file = libraryPath + "lib" + libName + ".so";
     if (!lib->Open(file.c_str())) {
         std::string error = lib->GetLastErrorString();
-        std::string absfile = vespa::Defaults::vespaHome();
-        absfile.append("/libexec/vespa/storage/lib" + libName + ".so");
+        std::string absfile = vespa::Defaults::underVespaHome("libexec/vespa/storage/");
+        absfile.append("lib" + libName + ".so");
         if (!lib->Open(absfile.c_str())) {
             LOG(error, "Could not load library %s: %s",
                        file.c_str(), error.c_str());