You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ff...@apache.org on 2016/03/01 02:52:29 UTC

[1/2] karaf git commit: KARAF-4366 : system scripts : fallback to generic init script for unknown os

Repository: karaf
Updated Branches:
  refs/heads/master caebbeb5d -> 30516e9e3


KARAF-4366 : system scripts : fallback to generic init script for unknown os


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/17c0c20f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/17c0c20f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/17c0c20f

Branch: refs/heads/master
Commit: 17c0c20f0e22fe9decfff9052795646b2130620c
Parents: 6a9ca43
Author: lburgazzoli <lb...@gmail.com>
Authored: Mon Feb 29 09:51:39 2016 +0100
Committer: lburgazzoli <lb...@gmail.com>
Committed: Mon Feb 29 09:51:39 2016 +0100

----------------------------------------------------------------------
 .../main/resources/resources/bin/contrib/karaf-service.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/17c0c20f/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
index ca247be..f8a1998 100755
--- a/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
+++ b/assemblies/features/base/src/main/resources/resources/bin/contrib/karaf-service.sh
@@ -39,6 +39,7 @@ END
 CONF_TEMPLATE="karaf-service-template.conf"
 SYSTEMD_TEMPLATE="karaf-service-template.systemd"
 SYSTEMD_TEMPLATE_INSTANCES="karaf-service-template.systemd-instances"
+INIT_TEMPLATE="karaf-service-template.init"
 INIT_REDHAT_TEMPLATE="karaf-service-template.init-redhat"
 INIT_DEBIAN_TEMPLATE="karaf-service-template.init-debian"
 SOLARIS_SMF_TEMPLATE="karaf-service-template.solaris-smf"
@@ -171,6 +172,15 @@ if [[ ! $KARAF_SERVICE_TEMPLATE ]]; then
                 chmod 755 "${PWD}/${KARAF_SERVICE_NAME}"
             fi
             ;;
+        *)
+            generate_service_descriptor \
+                "$INIT_TEMPLATE" \
+                "${PWD}/${KARAF_SERVICE_NAME}" \
+                "${CONF_TEMPLATE}" \
+                "${KARAF_SERVICE_CONF}"
+
+            chmod 755 "${PWD}/${KARAF_SERVICE_NAME}"
+            ;;
     esac
 else
     generate_service_descriptor \


[2/2] karaf git commit: Merge branch 'KARAF-4366' of https://github.com/lburgazzoli/apache-karaf

Posted by ff...@apache.org.
Merge branch 'KARAF-4366' of https://github.com/lburgazzoli/apache-karaf


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/30516e9e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/30516e9e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/30516e9e

Branch: refs/heads/master
Commit: 30516e9e360dfb40f78ad9f65295df526d6bebf2
Parents: caebbeb 17c0c20
Author: Freeman Fang <fr...@gmail.com>
Authored: Tue Mar 1 09:51:02 2016 +0800
Committer: Freeman Fang <fr...@gmail.com>
Committed: Tue Mar 1 09:51:02 2016 +0800

----------------------------------------------------------------------
 .../main/resources/resources/bin/contrib/karaf-service.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)
----------------------------------------------------------------------