github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-22 13:37:10 +00:00
Code Issues Projects Releases Wiki Activity

dm: acrn-tool: Add del runC configuration in acrnctl del

Browse Source 
The patch adds logic to delete runC configuration in acrnctl del command.
After launch the VM in container there will have configuration files in user
directory. When delete the VM by "acrnctl del" command the command will delete
the runC configuration files at same time.

Tracked-On: #2020
Signed-off-by: Long Liu <long.liu@intel.com>
Reviewed-by: Yu Wang <yu1.wang@intel.com>
Reviewed-by: Kaige Fu <kaige.fu@intel.com>
Acked-by: Yan, Like <like.yan@intel.com>
This commit is contained in:
Long Liu 2019-02-14 09:49:07 +08:00 committed by wenlingz
parent a0efd3e591
commit f95da1832e
1 changed files with 50 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tools/acrn-manager/acrnctl.c
View File

@ -436,6 +436,52 @@ static int acrnctl_do_stop(int argc, char *argv[])
return 0;
}
/* Function: Delete runC configuration */
static inline int del_runC(char *argv)
{
char cmd[128];
char cmd_out[256];
char runc_path[128];
/* The configuration added by launch_uos script */
if (snprintf(runc_path, sizeof(runc_path), "%s/runc/%s",
ACRN_CONF_PATH_ADD, argv) >= sizeof(runc_path)) {
printf("ERROR: runC path %s is truncated\n", runc_path);
return -1;
}
if (access(runc_path, F_OK) != 0)
return 0;
/* Check if there is a container */
if (snprintf(cmd, sizeof(cmd), "runc list | grep %s",
argv) >= sizeof(cmd)) {
printf("ERROR: runc cmd: %s is truncated\n", cmd);
return -1;
}
shell_cmd(cmd, cmd_out, sizeof(cmd_out));
if (strstr(cmd_out, argv) != NULL) {
/* If the container is still running stop it by runc pause */
if (strstr(cmd_out, "stopped") == NULL) {
printf("Pls stop the runC before del it !!\n");
return -1;
}
if (snprintf(cmd, sizeof(cmd), "runc delete %s",
argv) >= sizeof(cmd)) {
printf("ERROR: del container: %s trancated!", cmd);
return -1;
}
system(cmd);
if (snprintf(cmd, sizeof(cmd), "rm -f %s/runc/%s -rf",
ACRN_CONF_PATH_ADD, argv) >= sizeof(cmd)) {
printf("ERROR: delete cmd: %s trancated!\n", cmd);
return -1;
}
system(cmd);
}
return 0;
}
/* command: delete */
static int acrnctl_do_del(int argc, char *argv[])
{
@ -466,6 +512,10 @@ static int acrnctl_do_del(int argc, char *argv[])
return -1;
}
system(cmd);
if (del_runC(argv[i]) < 0) {
printf("ERROR: del runC failed!\n");
return -1;
}
}
return 0;