You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by af...@apache.org on 2017/06/02 22:13:24 UTC
nifi git commit: NIFI-1709 - Introduce logic to probe Linux version
using /etc/os-release to nifi.sh
Repository: nifi
Updated Branches:
refs/heads/master 39ad7a369 -> 4d78052dd
NIFI-1709 - Introduce logic to probe Linux version using /etc/os-release to nifi.sh
Add explicit paths to support SLES 11 SP4 / OpenSUSE init.d layout
This closes #1794
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4d78052d
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4d78052d
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4d78052d
Branch: refs/heads/master
Commit: 4d78052dd4f19372161391e93cde688f2fa8b864
Parents: 39ad7a3
Author: Andre F de Miranda <tr...@users.noreply.github.com>
Authored: Sun May 14 22:14:33 2017 +1000
Committer: Andre F de Miranda <tr...@users.noreply.github.com>
Committed: Sat Jun 3 08:12:52 2017 +1000
----------------------------------------------------------------------
.../src/main/resources/bin/nifi.sh | 29 ++++++++++++++++----
1 file changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/4d78052d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
index dd6e568..35fdfa1 100755
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/bin/nifi.sh
@@ -81,6 +81,12 @@ detectOS() {
export LDR_CNTRL=MAXDATA=0xB0000000@DSA
echo ${LDR_CNTRL}
fi
+ # In addition to those, go around the linux space and query the widely
+ # adopted /etc/os-release to detect linux variants
+ if [ -f /etc/os-release ]
+ then
+ source /etc/os-release
+ fi
}
unlimitFD() {
@@ -174,6 +180,8 @@ install() {
SVC_NAME=$2
fi
+ # since systemd seems to honour /etc/init.d we don't still create native systemd services
+ # yet...
initd_dir='/etc/init.d'
SVC_FILE="${initd_dir}/${SVC_NAME}"
@@ -222,11 +230,22 @@ SERVICEDESCRIPTOR
# Provide the user execute access on the file
chmod u+x ${SVC_FILE}
- rm -f "/etc/rc2.d/S65${SVC_NAME}"
- ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/S65${SVC_NAME}" || { echo "Could not create link /etc/rc2.d/S65${SVC_NAME}"; exit 1; }
- rm -f "/etc/rc2.d/K65${SVC_NAME}"
- ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/K65${SVC_NAME}" || { echo "Could not create link /etc/rc2.d/K65${SVC_NAME}"; exit 1; }
- echo "Service ${SVC_NAME} installed"
+
+ # If SLES or OpenSuse...
+ if [ "${ID}" = "opensuse" ] || [ "${ID}" = "sles" ]; then
+ rm -f "/etc/rc.d/rc2.d/S65${SVC_NAME}"
+ ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc.d/rc2.d/S65${SVC_NAME}" || { echo "Could not create link /etc/rc.d/rc2.d/S65${SVC_NAME}"; exit 1; }
+ rm -f "/etc/rc.d/rc2.d/K65${SVC_NAME}"
+ ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc.d/rc2.d/K65${SVC_NAME}" || { echo "Could not create link /etc/rc.d/rc2.d/K65${SVC_NAME}"; exit 1; }
+ echo "Service ${SVC_NAME} installed"
+ # Anything other fallback to the old approach
+ else
+ rm -f "/etc/rc2.d/S65${SVC_NAME}"
+ ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/S65${SVC_NAME}" || { echo "Could not create link /etc/rc2.d/S65${SVC_NAME}"; exit 1; }
+ rm -f "/etc/rc2.d/K65${SVC_NAME}"
+ ln -s "/etc/init.d/${SVC_NAME}" "/etc/rc2.d/K65${SVC_NAME}" || { echo "Could not create link /etc/rc2.d/K65${SVC_NAME}"; exit 1; }
+ echo "Service ${SVC_NAME} installed"
+ fi
}
run() {