Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6F669E49E for ; Mon, 11 Mar 2013 17:31:48 +0000 (UTC) Received: (qmail 47538 invoked by uid 500); 11 Mar 2013 17:31:47 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 47327 invoked by uid 500); 11 Mar 2013 17:31:47 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 47036 invoked by uid 99); 11 Mar 2013 17:31:46 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Mar 2013 17:31:46 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3FB5DC118; Mon, 11 Mar 2013 17:31:46 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [7/17] git commit: refs/heads/ui-multiple-nics - CLOUDSTACK-1201 - Fix update to cloud user's home dir on mgmt server. It was printing a meaningless failure if the cloud user's home dir didn't need to be updated. Message-Id: <20130311173146.3FB5DC118@tyr.zones.apache.org> Date: Mon, 11 Mar 2013 17:31:46 +0000 (UTC) CLOUDSTACK-1201 - Fix update to cloud user's home dir on mgmt server. It was printing a meaningless failure if the cloud user's home dir didn't need to be updated. Signed-off-by: Marcus Sorensen 1362809648 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ebafcf82 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ebafcf82 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ebafcf82 Branch: refs/heads/ui-multiple-nics Commit: ebafcf826b2506e779c8de8887d867ca4e0306bf Parents: e35ce65 Author: Marcus Sorensen Authored: Fri Mar 8 23:14:08 2013 -0700 Committer: Marcus Sorensen Committed: Fri Mar 8 23:14:08 2013 -0700 ---------------------------------------------------------------------- packaging/centos63/cloud.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ebafcf82/packaging/centos63/cloud.spec ---------------------------------------------------------------------- diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 002fbbb..e340dd0 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -323,7 +323,10 @@ fi # change cloud user's home to 4.1+ version if needed. Would do this via 'usermod', but it # requires that cloud user not be in use, so RPM could not be installed while management is running -getent passwd cloud | grep -q /var/lib/cloud && sed -i 's/\/var\/lib\/cloud\/management/\/var\/cloudstack\/management/g' /etc/passwd +if getent passwd cloud | grep -q /var/lib/cloud; then + sed -i 's/\/var\/lib\/cloud\/management/\/var\/cloudstack\/management/g' /etc/passwd +fi + %post awsapi if [ -d "%{_datadir}/%{name}-management" ] ; then