journal-file: allow opening journal files for write when machine ID is not initialized
We allow reading them, and we allow creating them, but we so far did not allow opening existing ones for write – if the machine ID is not initialized. Let's fix that. (This is just to fix an asymmetry. I have no immediate use for this. But test code should in theory be able to use this, if it runs in an incompletely initialized environment.)
This commit is contained in:
@@ -511,8 +511,12 @@ static int journal_file_verify_header(JournalFile *f) {
|
||||
int r;
|
||||
|
||||
r = sd_id128_get_machine(&machine_id);
|
||||
if (r < 0)
|
||||
return r;
|
||||
if (r < 0) {
|
||||
if (!ERRNO_IS_MACHINE_ID_UNSET(r)) /* handle graceful if machine ID is not initialized yet */
|
||||
return r;
|
||||
|
||||
machine_id = SD_ID128_NULL;
|
||||
}
|
||||
|
||||
if (!sd_id128_equal(machine_id, f->header->machine_id))
|
||||
return log_debug_errno(SYNTHETIC_ERRNO(EHOSTDOWN),
|
||||
|
||||
Reference in New Issue
Block a user