Alon Bar-Lev has posted comments on this change.
Change subject: packaging, tools: Use JVM selected during setup (#834436)
......................................................................
Patch Set 2: (11 inline comments)
....................................................
File backend/manager/conf/kerberos/engine-manage-domains
Line 6: # should be under the /etc directory.
Line 7: #
Line 8:
Line 9: # Load the prolog:
Line 10: . $(dirname $(readlink -f $0))/engine-prolog.sh
Should be:
. "$(dirname "$(readlink -f "$0")")/engine-prolog.sh"
Line 11:
Line 12: CONF_DIR=${ENGINE_ETC}/engine-manage-domains
Line 13: CONF_FILE=$CONF_DIR/engine-manage-domains.conf
Line 14:
Line 8:
Line 9: # Load the prolog:
Line 10: . $(dirname $(readlink -f $0))/engine-prolog.sh
Line 11:
Line 12: CONF_DIR=${ENGINE_ETC}/engine-manage-domains
CONF_DIR="${ENGINE_ETC}/engine-manage-domains"
etc...
Line 13: CONF_FILE=$CONF_DIR/engine-manage-domains.conf
Line 14:
Line 15: found=0
Line 16: for ((i=1; i<=$# && ! found; i++))
Line 132: LdapServers
Line 133: LDAPProviderTypes
Line 134: EOF
Line 135:
Line 136: ${JAVA_HOME}/bin/java -cp .:$CP
org.ovirt.engine.core.utils.kerberos.ManageDomains "$@"
-propertiesFile=$PROPERTIES_FILE
"${JAVA_HOME}/bin/java"
Line 137:
Line 138: RET_VAL=$?
Line 139:
Line 140: rm $PROPERTIES_FILE
....................................................
File backend/manager/modules/utils/src/main/resources/engine-manage-domains.conf
Line 1: jaasFile=/usr/share/ovirt-engine/conf/jaas.conf
Line 2: krb5confFile=/etc/ovirt-engine/krb5.conf
Line 3: jbossDataSourceFile=/etc/ovirt-engine/engine-service.xml
Line 4: jbossLoginConfigFile=/et/ovirt-engine/engine-service.xml
Line 5: engineConfigExecutable=/bin/engine-config
/usr/bin/engine-config
Line 6: localHostEntry=localhost
....................................................
File backend/manager/tools/engine-config/src/main/resources/engine-config
Line 6: # should be under the /etc directory.
Line 7: #
Line 8:
Line 9: # Load the prolog:
Line 10: . $(dirname $(readlink -f $0))/engine-prolog.sh
same here, quotes.
Line 11:
Line 12: usage () {
Line 13: printf "engine-config: get/set/list configuration\n"
Line 14: printf "USAGE:\n"
Line 113: fi
Line 114: done
Line 115:
Line 116: # Run!
Line 117: exec ${JAVA_HOME}/bin/java -cp .:$CP
-Dlog4j.configuration=file:${ENGINE_ETC}/engine-config/log4j.xml
org.ovirt.engine.core.config.EngineConfig "$@"
quotes.
....................................................
File backend/manager/tools/engine-tools-common/src/main/shell/engine-prolog.sh
Line 5: }
Line 6:
Line 7: # Load the local configuration:
Line 8: load_config() {
Line 9: local
engine_defaults="${ENGINE_DEFAULTS:=/usr/share/ovirt-engine/conf/engine.conf.defaults}"
Please don't use :=
ENGINE_DEFAULTS="${ENGINE_DEFAULTS:-/usr/share/ovirt-engine/conf/engine.conf.default}"
Line 10: if [ ! -r "${engine_defaults}" ]
Line 11: then
Line 12: die "Can't load defaults file \"${engine_defaults}\"."
Line 13: fi
Line 6:
Line 7: # Load the local configuration:
Line 8: load_config() {
Line 9: local
engine_defaults="${ENGINE_DEFAULTS:=/usr/share/ovirt-engine/conf/engine.conf.defaults}"
Line 10: if [ ! -r "${engine_defaults}" ]
Why not use ${ENGINE_DEFAULTS}?
Line 11: then
Line 12: die "Can't load defaults file \"${engine_defaults}\"."
Line 13: fi
Line 14: . "${engine_defaults}"
Line 11: then
Line 12: die "Can't load defaults file \"${engine_defaults}\"."
Line 13: fi
Line 14: . "${engine_defaults}"
Line 15: local engine_vars=${ENGINE_VARS:=/etc/sysconfig/ovirt-engine}
Same here... use ':-'
Line 16: if [ ! -r "${engine_vars}" ]
Line 17: then
Line 18: die "Can't load configuration file \"${engine_vars}\"."
Line 19: fi
....................................................
File Makefile
Line 201
Line 202
Line 203
Line 204
Line 205
Can we remove the scripts as well? scripts->bin
....................................................
File packaging/fedora/setup/basedefs.py
Line 69: FILE_JBOSSAS_CONF="/etc/%s/%s.conf" % (ENGINE_SERVICE_NAME,
ENGINE_SERVICE_NAME)
Line 70: FILE_ENGINE_SYSCONFIG="/etc/sysconfig/ovirt-engine"
Line 71: FILE_DB_INSTALL_SCRIPT="engine-db-install.sh"
Line 72: FILE_DB_UPGRADE_SCRIPT="upgrade.sh"
Line 73: FILE_RHEVM_CONFIG_BIN="/bin/engine-config"
/usr/bin/engine-config
Line 74: FILE_RHEVM_CONFIG_PROPS="engine-config-install.properties"
Line 75: FILE_RHEVM_EXTENDED_CONF = os.path.join(DIR_CONFIG,
FILE_RHEVM_CONFIG_PROPS)
Line 76: FILE_RESOLV_CONF="/etc/resolv.conf"
Line 77: FILE_SLIMMING_PROFILE_CONF="/usr/share/ovirt-engine/conf/slimming.conf"
--
To view, visit http://gerrit.ovirt.org/7556
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I501e5e5cca615f5bfffef225d9ebb3204f16b7c5
Gerrit-PatchSet: 2
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Alex Lourie <[email protected]>
Gerrit-Reviewer: Alon Bar-Lev <[email protected]>
Gerrit-Reviewer: Juan Hernandez <[email protected]>
Gerrit-Reviewer: Moran Goldboim <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
