Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 60631200B8D for ; Fri, 9 Sep 2016 00:17:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 5F210160AAD; Thu, 8 Sep 2016 22:17:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A813E160AD1 for ; Fri, 9 Sep 2016 00:17:56 +0200 (CEST) Received: (qmail 63857 invoked by uid 500); 8 Sep 2016 22:17:55 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 63848 invoked by uid 99); 8 Sep 2016 22:17:55 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 08 Sep 2016 22:17:55 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9CBA8E08B8; Thu, 8 Sep 2016 22:17:55 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aonishuk@apache.org To: commits@ambari.apache.org Date: Thu, 08 Sep 2016 22:17:57 -0000 Message-Id: <700d6ad0fded44a2850083857d98ac37@git.apache.org> In-Reply-To: <2e6ff504d02f402e8190f008c00074a9@git.apache.org> References: <2e6ff504d02f402e8190f008c00074a9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ambari git commit: AMBARI-18343. Ambari server start fails after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster (aonishuk) archived-at: Thu, 08 Sep 2016 22:17:57 -0000 AMBARI-18343. Ambari server start fails after upgrade due to missing krb5JAASLogin.conf file on WireEncrypted cluster (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33931103 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33931103 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33931103 Branch: refs/heads/branch-2.5 Commit: 33931103464b3564652f0a8497557769e41b9eeb Parents: df5fdb3 Author: Andrew Onishuk Authored: Fri Sep 9 01:17:07 2016 +0300 Committer: Andrew Onishuk Committed: Fri Sep 9 01:17:07 2016 +0300 ---------------------------------------------------------------------- ambari-server/src/main/package/rpm/preinstall.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/33931103/ambari-server/src/main/package/rpm/preinstall.sh ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/package/rpm/preinstall.sh b/ambari-server/src/main/package/rpm/preinstall.sh index 28878bb..b4c4da0 100644 --- a/ambari-server/src/main/package/rpm/preinstall.sh +++ b/ambari-server/src/main/package/rpm/preinstall.sh @@ -43,22 +43,19 @@ then mv "$SERVER_CONF_SAVE" "$SERVER_CONF_SAVE_BACKUP" fi -# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually. if [ -f "$AMBARI_PROPERTIES" ] then - mv -f "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD" + cp -n "$AMBARI_PROPERTIES" "$AMBARI_PROPERTIES_OLD" fi -# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually. if [ -f "$AMBARI_ENV" ] then - mv -f "$AMBARI_ENV" "$AMBARI_ENV_OLD" + cp -n "$AMBARI_ENV" "$AMBARI_ENV_OLD" fi -# Creating rpmsave files is done automatically by rpm, however on minor version upgrade (e.g. 2.4.0 -> 2.4.0.1) has to be done manually. if [ -f "$AMBARI_KRB_JAAS_LOGIN_FILE" ] then - mv -f "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD" + cp -n "$AMBARI_KRB_JAAS_LOGIN_FILE" "$AMBARI_KRB_JAAS_LOGIN_FILE_OLD" fi if [ -d "$STACKS_FOLDER" ]