From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 22 Dec 2015 15:47:40 +0000 (+0000)
Subject: Do not override config.ini
X-Git-Tag: argeo-commons-2.1.32~5
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=379f22faac7044331f59c4f03115544f6567697f;p=lgpl%2Fargeo-commons.git

Do not override config.ini

git-svn-id: https://svn.argeo.org/commons/trunk@8742 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index 03897d637..0c88aabd7 100644
--- a/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -44,7 +44,12 @@ start() {
 		fi
 	fi
 
-	cp --preserve $CONF_DIR/config.ini $CONF_RW/config.ini
+	if [ ! -f $CONF_RW/config.ini ]; then
+		echo osgi.configuration.cascaded=true > $CONF_RW/config.ini
+		echo osgi.sharedConfiguration.area=$CONF_DIR >> $CONF_RW/config.ini
+		echo osgi.sharedConfiguration.area.readOnly=true >> $CONF_RW/config.ini
+		#cp --preserve $CONF_DIR/config.ini $CONF_RW/config.ini
+	fi
 	touch $SHUTDOWN_FILE
 	cd $EXEC_DIR
 	$JVM \