|
|
@ -23,8 +23,23 @@ void load_template_load_cfg(config_all* _all_config, char* cmd) {
|
|
|
|
char* str_value = str_key_value;
|
|
|
|
char* str_value = str_key_value;
|
|
|
|
if (strstr(str_value, "enable") || strstr(str_value, "disable")) {
|
|
|
|
if (strstr(str_value, "enable") || strstr(str_value, "disable")) {
|
|
|
|
disk_status* disk_cfg = malloc(sizeof(disk_status));
|
|
|
|
disk_status* disk_cfg = malloc(sizeof(disk_status));
|
|
|
|
|
|
|
|
disk_cfg->deferring_size = 0;
|
|
|
|
|
|
|
|
disk_cfg->deferring_file = 0;
|
|
|
|
load_pars_values_status(disk_cfg, str_key, str_value);
|
|
|
|
load_pars_values_status(disk_cfg, str_key, str_value);
|
|
|
|
_all_config->v_disk_status.pfVectorAdd(&_all_config->v_disk_status, disk_cfg);
|
|
|
|
_all_config->v_disk_status.pfVectorAdd(&_all_config->v_disk_status, disk_cfg);
|
|
|
|
|
|
|
|
for (int index = 0; index < get_device_vec()->vectorList.total; index++) {
|
|
|
|
|
|
|
|
device_config* _config_disk = (device_config*)get_device_vec()->pfVectorGet(get_device_vec(), index);
|
|
|
|
|
|
|
|
for (int j=0; j < _all_config->v_disk_status.vectorList.total;j++) {
|
|
|
|
|
|
|
|
disk_status* config_disk_status = (disk_status*)_all_config->v_disk_status.pfVectorGet(&_all_config->v_disk_status, j);
|
|
|
|
|
|
|
|
if (strstr(config_disk_status->device, _config_disk->name_disk)) {
|
|
|
|
|
|
|
|
config_disk_status->device = _config_disk->name_disk;
|
|
|
|
|
|
|
|
config_disk_status->fs = _config_disk->file_system;
|
|
|
|
|
|
|
|
config_disk_status->mount_point = _config_disk->mounted;
|
|
|
|
|
|
|
|
config_disk_status->name = _config_disk->type_dick;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
config_u_g_p* _config = malloc(sizeof(config_u_g_p));
|
|
|
|
config_u_g_p* _config = malloc(sizeof(config_u_g_p));
|
|
|
@ -173,19 +188,7 @@ void load_pars_values(config_u_g_p* _config, config_all* _all_config, char* str_
|
|
|
|
config_disk_status->deferring_size = _config->deferring_size;
|
|
|
|
config_disk_status->deferring_size = _config->deferring_size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for (int index = 0; index < get_device_vec()->vectorList.total; index++) {
|
|
|
|
|
|
|
|
device_config* _config_disk = (device_config*)get_device_vec()->pfVectorGet(get_device_vec(), index);
|
|
|
|
|
|
|
|
for (int j=0; j < _all_config->v_disk_status.vectorList.total;j++) {
|
|
|
|
|
|
|
|
disk_status* config_disk_status = (disk_status*)_all_config->v_disk_status.pfVectorGet(&_all_config->v_disk_status, j);
|
|
|
|
|
|
|
|
if (strstr(config_disk_status->device, _config_disk->name_disk)) {
|
|
|
|
|
|
|
|
config_disk_status->device = _config_disk->name_disk;
|
|
|
|
|
|
|
|
config_disk_status->fs = _config_disk->file_system;
|
|
|
|
|
|
|
|
config_disk_status->mount_point = _config_disk->mounted;
|
|
|
|
|
|
|
|
config_disk_status->name = _config_disk->type_dick;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
else {
|
|
|
|
|
|
|
|
|
|
|
|