diff options
| author | David Teigland <teigland@redhat.com> | 2021-10-13 13:34:46 -0500 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2021-10-13 13:42:04 -0500 |
| commit | 272d1ccac8654c0d74ecf255d13de0a6222ff96f (patch) | |
| tree | 2cd44fb230eac989385a1425ea533c41ae17866a | |
| parent | 062ea3c4181ef158620556bbab2358bc76eeab90 (diff) | |
| download | lvm2-272d1ccac8654c0d74ecf255d13de0a6222ff96f.tar.gz | |
devices file: unmatching system id should just be warning
there are likely more cases than not where the systemid
does not match and the command should still run.
| -rw-r--r-- | lib/device/device_id.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/device/device_id.c b/lib/device/device_id.c index ce43e61ca..e4208c56b 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c @@ -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; |