Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id C735F10D5E for ; Thu, 17 Apr 2014 00:25:55 +0000 (UTC) Received: (qmail 37660 invoked by uid 500); 17 Apr 2014 00:25:55 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 37639 invoked by uid 500); 17 Apr 2014 00:25:54 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 37630 invoked by uid 99); 17 Apr 2014 00:25:54 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 17 Apr 2014 00:25:54 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7278693CE25; Thu, 17 Apr 2014 00:25:54 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yasker@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to 90106f6 Date: Thu, 17 Apr 2014 00:25:54 +0000 (UTC) Repository: cloudstack Updated Branches: refs/heads/4.3 889d80b7e -> 90106f6d8 CLOUDSTACK-6285: Fix savepassword.sh script for clear out old entries Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/90106f6d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/90106f6d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/90106f6d Branch: refs/heads/4.3 Commit: 90106f6d8e7db7c9a4d73ba2a3f5b6f40d190c9e Parents: 889d80b Author: Sheng Yang Authored: Tue Mar 25 15:55:41 2014 -0700 Committer: Sheng Yang Committed: Wed Apr 16 17:25:35 2014 -0700 ---------------------------------------------------------------------- systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90106f6d/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh b/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh index 1ea27e5..21fa09d 100755 --- a/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh +++ b/systemvm/patches/debian/config/opt/cloud/bin/savepassword.sh @@ -52,7 +52,7 @@ done [ -f $PASSWD_FILE ] || touch $PASSWD_FILE -sed -i /$VM_IP/d $PASSWD_FILE +sed -i /$VM_IP=/d $PASSWD_FILE ps aux | grep serve_password.sh |grep -v grep 2>&1 > /dev/null if [ $? -eq 0 ]