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 <[email protected]> 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/gslb-wip
Commit: ebafcf826b2506e779c8de8887d867ca4e0306bf
Parents: e35ce65
Author: Marcus Sorensen <[email protected]>
Authored: Fri Mar 8 23:14:08 2013 -0700
Committer: Marcus Sorensen <[email protected]>
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
