You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ja...@apache.org on 2017/02/22 22:49:45 UTC
lucene-solr:branch_6x: SOLR-10055: Linux installer now renames
existing bin/solr.in.* as bin/solr.in.*.orig to avoid wrong resolving.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x b1ac6ddcf -> 11a7313ce
SOLR-10055: Linux installer now renames existing bin/solr.in.* as bin/solr.in.*.orig to avoid wrong resolving.
(cherry picked from commit 1e206d8)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/11a7313c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/11a7313c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/11a7313c
Branch: refs/heads/branch_6x
Commit: 11a7313cecb2f16f272ed4658ccb0f8d723d9029
Parents: b1ac6dd
Author: Jan H�ydahl <ja...@apache.org>
Authored: Wed Feb 22 23:44:19 2017 +0100
Committer: Jan H�ydahl <ja...@apache.org>
Committed: Wed Feb 22 23:48:03 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 3 +++
solr/bin/install_solr_service.sh | 2 ++
2 files changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a7313c/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 757fb72..f9ecd58 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -122,6 +122,9 @@ Bug Fixes
* SOLR-10168: ShardSplit can fail with NPE in OverseerCollectionMessageHandler#waitForCoreAdminAsyncCallToComplete. (Mark Miller)
+* SOLR-10055: Linux installer now renames existing bin/solr.in.* as bin/solr.in.*.orig to make the installed config in
+ /etc/defaults be the one found by default when launching solr manually. (janhoy)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/11a7313c/solr/bin/install_solr_service.sh
----------------------------------------------------------------------
diff --git a/solr/bin/install_solr_service.sh b/solr/bin/install_solr_service.sh
index a23612f..b331870 100755
--- a/solr/bin/install_solr_service.sh
+++ b/solr/bin/install_solr_service.sh
@@ -322,6 +322,8 @@ elif [ -f "/etc/default/$SOLR_SERVICE.in.sh" ]; then
else
echo -e "\nInstalling /etc/default/$SOLR_SERVICE.in.sh ...\n"
cp "$SOLR_INSTALL_DIR/bin/solr.in.sh" "/etc/default/$SOLR_SERVICE.in.sh"
+ mv "$SOLR_INSTALL_DIR/bin/solr.in.sh" "$SOLR_INSTALL_DIR/bin/solr.in.sh.orig"
+ mv "$SOLR_INSTALL_DIR/bin/solr.in.cmd" "$SOLR_INSTALL_DIR/bin/solr.in.cmd.orig"
echo "SOLR_PID_DIR=\"$SOLR_VAR_DIR\"
SOLR_HOME=\"$SOLR_VAR_DIR/data\"
LOG4J_PROPS=\"$SOLR_VAR_DIR/log4j.properties\"