DaanHoogland commented on a change in pull request #3030: correct permissions
in spec file and fix class path specified variable
URL: https://github.com/apache/cloudstack/pull/3030#discussion_r234531916
##########
File path: packaging/systemd/cloudstack-management.service
##########
@@ -28,8 +28,13 @@ Environment="NAME=cloudstack-management"
EnvironmentFile=/etc/default/cloudstack-management
ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JAVA_HOME=$(
readlink -f $( which java ) | sed s:bin/.*$:: )"
ExecStartPre=/bin/bash -c "/bin/systemctl set-environment JARS=$(ls
/usr/share/cloudstack-management/lib/*.jar | tr '\n' ':' | sed s'/.$//')"
+<<<<<<< HEAD
ExecStart=/usr/bin/jsvc -home "${JAVA_HOME}" -user "${CLOUDSTACK_USER}" -cp
"${JARS}:${CLASSPATH}" -errfile ${LOGDIR}/${NAME}.err -cwd ${LOGDIR} -pidfile
"${CLOUDSTACK_PID}" ${JAVA_OPTS} "${BOOTSTRAP_CLASS}"
ExecStop=/usr/bin/jsvc -cp "$JARS:$CLASSPATH" -pidfile "$CLOUDSTACK_PID" -stop
"$BOOTSTRAP_CLASS"
+=======
Review comment:
this is a git artifact, @svenvogel . It should not show here, so something
went wrong :(
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
