github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 10:04:42 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-manager: change path of vm conf files

Browse Source 
The path of vm conf files changed from "/opt/acrn/conf" to "/usr/share/acrn/conf",
since "/opt" is not generally used on clearlinux.

Tracked-On: #2040
Signed-off-by: Yan, Like <like.yan@intel.com>
Acked-by: Yin Fengwei <fengwei.yin@intel.com>
This commit is contained in:
Yan, Like
2018-12-12 15:25:05 +08:00
committed by wenlingz
parent 2f30dcdb37
commit 04fef4f363
5 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/acrn-manager/acrn_vm_ops.c
View File

@@ -128,13 +128,13 @@ static void _scan_alive_vm(void)
int pid;
int ret;
ret = check_dir(ACRN_DM_SOCK_ROOT);
ret = check_dir(ACRN_DM_SOCK_PATH);
if (ret) {
pdebug();
return;
}
dir = opendir(ACRN_DM_SOCK_ROOT);
dir = opendir(ACRN_DM_SOCK_PATH);
if (!dir) {
pdebug();
return;
@@ -223,22 +223,19 @@ static void _scan_added_vm(void)
char suffix[128];
int ret;
if (check_dir("/opt") || check_dir("/opt/acrn"))
return;
ret = check_dir(ACRNCTL_OPT_ROOT);
ret = check_dir(ACRN_CONF_PATH);
if (ret) {
pdebug();
return;
}
ret = check_dir("/opt/acrn/conf/add");
ret = check_dir(ACRN_CONF_PATH_ADD);
if (ret) {
pdebug();
return;
}
dir = opendir("/opt/acrn/conf/add");
dir = opendir(ACRN_CONF_PATH_ADD);
if (!dir) {
pdebug();
return;
@@ -374,8 +371,8 @@ int start_vm(const char *vmname)
{
char cmd[128];
if (snprintf(cmd, sizeof(cmd), "bash %s/add/%s.sh $(cat %s/add/%s.args)",
ACRNCTL_OPT_ROOT, vmname, ACRNCTL_OPT_ROOT, vmname) >= sizeof(cmd)) {
if (snprintf(cmd, sizeof(cmd), "bash %s/%s.sh $(cat %s/%s.args)",
ACRN_CONF_PATH_ADD, vmname, ACRN_CONF_PATH_ADD, vmname) >= sizeof(cmd)) {
printf("ERROR: command is truncated\n");
return -1;
}