Merge branch '7826' into 'master'

gitlab · gitlab · commit 617682d868fd · 2018-03-25T18:56:19.000+08:00
Fixes ZSTAC-7826

Closes ZSTAC-7826

See merge request zstackio/zstack!2422
diff --git a/conf/install/zstack-server b/conf/install/zstack-server
@@ -25,15 +25,15 @@ if [ $? -ne 0 ]; then
 fi
 
 check_status() {
-    ZSTACK_HOME=$zstack_app zstack-ctl status
+    ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl status
 }
 
 stop_zstack(){
-    ZSTACK_HOME=$zstack_app zstack-ctl stop
+    ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl stop
 }
 
 start_zstack(){
-    ZSTACK_HOME=$zstack_app zstack-ctl start
+    ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl start
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ if [ $? -ne 0 ]; then`
`25`	`25`	`fi`
`26`	`26`
`27`	`27`	`check_status() {`
`28`		`- ZSTACK_HOME=$zstack_app zstack-ctl status`
	`28`	+ ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl status
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`stop_zstack(){`
`32`		`- ZSTACK_HOME=$zstack_app zstack-ctl stop`
	`32`	+ ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl stop
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`start_zstack(){`
`36`		`- ZSTACK_HOME=$zstack_app zstack-ctl start`
	`36`	+ ZSTACK_HOME=$zstack_app HOME=`echo ~root` zstack-ctl start
`37`	`37`	`}`
`38`	`38`
`39`	`39`