cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject [46/50] [abbrv] git commit: refs/heads/ui-multiple-nics - debian: Change the homedir of the user 'cloud'
Date Tue, 05 Mar 2013 18:37:39 GMT
debian: Change the homedir of the user 'cloud'


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/579b0275
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/579b0275
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/579b0275

Branch: refs/heads/ui-multiple-nics
Commit: 579b02756f370608b69fa1d2580563cd3d481bdf
Parents: c56de5e
Author: Wido den Hollander <wido@widodh.nl>
Authored: Tue Mar 5 16:10:19 2013 +0100
Committer: Wido den Hollander <wido@widodh.nl>
Committed: Tue Mar 5 16:10:38 2013 +0100

----------------------------------------------------------------------
 debian/cloudstack-management.install  |    4 ++--
 debian/cloudstack-management.postinst |    6 +++---
 debian/rules                          |    8 +++-----
 3 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/579b0275/debian/cloudstack-management.install
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install
index f689862..12478e1 100644
--- a/debian/cloudstack-management.install
+++ b/debian/cloudstack-management.install
@@ -22,8 +22,8 @@
 /var/cache/cloudstack/management/work
 /var/cache/cloudstack/management/temp
 /var/log/cloudstack/management
-/var/lib/cloud/mnt
-/var/lib/cloud/management
+/var/lib/cloudstack/mnt
+/var/lib/cloudstack/management
 /usr/bin/cloud-update-xenserver-licenses
 /usr/bin/cloud-setup-management
 /usr/bin/cloud-setup-databases

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/579b0275/debian/cloudstack-management.postinst
----------------------------------------------------------------------
diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst
index 6fe0145..5b6b4b3 100644
--- a/debian/cloudstack-management.postinst
+++ b/debian/cloudstack-management.postinst
@@ -18,9 +18,9 @@
 
 if [ "$1" = configure ]; then
     if ! getent passwd cloud >/dev/null; then
-        adduser --quiet --system --group --no-create-home --home /usr/share/cloudstack-manager
cloud
+        adduser --quiet --system --group --no-create-home --home /var/lib/cloudstack/management
cloud
+    else
+        usermod -m /var/lib/cloudstack/management cloud
     fi
     chown cloud /var/log/cloudstack/management
 fi
-
-#DEBHELPER#

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/579b0275/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index ba9056e..cf950d1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,10 +54,8 @@ install:
 	mkdir -p debian/tmp$(SYSCONFDIR)/init.d
 	mkdir -p debian/tmp/var/cache/$(PACKAGE)
 	mkdir -p debian/tmp/var/log/$(PACKAGE)
-	mkdir -p debian/tmp/var/lib/cloud
+	mkdir -p debian/tmp/var/lib/$(PACKAGE)
 	mkdir -p debian/tmp/usr/bin
-	mkdir -p debian/tmp/usr/share/cloud
-	mkdir -p debian/tmp/usr/lib/cloud
 
 	# cloudstack-agent
 	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
@@ -81,8 +79,8 @@ install:
 	mkdir debian/tmp/var/cache/$(PACKAGE)/management/work
 	mkdir debian/tmp/var/cache/$(PACKAGE)/management/temp
 	mkdir debian/tmp/var/log/$(PACKAGE)/ipallocator
-	mkdir debian/tmp/var/lib/cloud/management
-	mkdir debian/tmp/var/lib/cloud/mnt
+	mkdir debian/tmp/var/lib/$(PACKAGE)/management
+	mkdir debian/tmp/var/lib/$(PACKAGE)/mnt
 	cp -r client/target/utilities/scripts/db/* debian/tmp/usr/share/$(PACKAGE)-management/setup/
 	cp -r client/target/cloud-client-ui-4.2.0-SNAPSHOT/* debian/tmp/usr/share/$(PACKAGE)-management/webapps/client/
 	cp server/target/conf/* debian/tmp$(SYSCONFDIR)/$(PACKAGE)/server/


Mime
View raw message