shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

devices file: unmatching system id should just be warning

Browse Source 
there are likely more cases than not where the systemid
does not match and the command should still run.
This commit is contained in:
David Teigland 2021-10-13 13:34:46 -05:00
parent 062ea3c418
commit 272d1ccac8
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/device/device_id.c
View File

@ -543,11 +543,8 @@ int device_ids_read(struct cmd_context *cmd)
log_debug("read devices file systemid %s", _devices_file_systemid);
if ((!cmd->system_id && _devices_file_systemid[0]) ||
(cmd->system_id && strcmp(cmd->system_id, _devices_file_systemid))) {
log_warn("WARNING: ignoring devices file with wrong system id %s vs local %s.",
log_warn("WARNING: devices file has unmatching system id %s vs local %s.",
_devices_file_systemid[0] ? _devices_file_systemid : "none", cmd->system_id ?: "none");
free_dus(&cmd->use_devices);
ret = 0;
goto out;
}
continue;
}
@ -613,7 +610,6 @@ int device_ids_read(struct cmd_context *cmd)
dm_list_add(&cmd->use_devices, &du->list);
}
out:
if (fclose(fp))
stack;