X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Finternal%2Fkernel%2FKernel.java;h=1002304007ff3e64d42a86834a8de8a64fa95f6a;hb=070656b6431e699a0f6ac8dc1839bce3fc2509ce;hp=871163fc0f57df925446cc9c2a163e79cf1568b8;hpb=739faf3400e7f2f1b2bf06bd1ccf9da042c78f5b;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
index 871163fc0..100230400 100644
--- a/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
+++ b/org.argeo.cms/src/org/argeo/cms/internal/kernel/Kernel.java
@@ -173,8 +173,14 @@ final class Kernel implements KernelHeader, KernelConstants, ServiceListener {
 
 	private void firstInit() {
 		log.info("## FIRST INIT ##");
-		File initDir = new File(getFrameworkProp(NODE_INIT,
-				KernelUtils.getOsgiInstancePath("../../../init")));
+		String nodeInit = getFrameworkProp(NODE_INIT);
+		if (nodeInit == null)
+			nodeInit = "../../init";
+		File initDir;
+		if (nodeInit.startsWith("."))
+			initDir = KernelUtils.getExecutionDir(nodeInit);
+		else
+			initDir = new File(nodeInit);
 		// TODO also uncompress archives
 		if (initDir.exists())
 			try {