Clarify naming.

[lgpl/argeo-commons.git] / dist / osgi-boot / src / main / rpm / usr / sbin / osgi-service

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 03897d637401a2f78f9ada9a992430724d9399af..2ce1b61c20df4d6eed4cb3ff2af213747c1f7faa 100644 (file)
--- a/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -44,13 +44,18 @@ 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 \
                -Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
                -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
-               -Dorg.osgi.framework.security=osgi \
+               -Djava.security.manager= \
                -Djava.security.policy="file:/etc/osgiboot/all.policy" \
                $JAVA_OPTS -jar $OSGI_FRAMEWORK \
                -clean \