morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

machine-id-setup: use return log_error… pattern

Browse Source 
No functional difference, but this way it's clearer that the original errno
value is returned.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2017-12-19 10:02:27 +01:00
parent 5364c68690
commit d49a7143fc
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/machine-id-setup.c
View File

@@ -119,16 +119,15 @@ int machine_id_setup(const char *root, sd_id128_t machine_id, sd_id128_t *ret) {
fd = open(etc_machine_id, O_RDONLY|O_CLOEXEC|O_NOCTTY);
if (fd < 0) {
if (old_errno == EROFS && errno == ENOENT)
log_error_errno(errno,
return log_error_errno(errno,
"System cannot boot: Missing /etc/machine-id and /etc is mounted read-only.\n"
"Booting up is supported only when:\n"
"1) /etc/machine-id exists and is populated.\n"
"2) /etc/machine-id exists and is empty.\n"
"3) /etc/machine-id is missing and /etc is writable.\n");
else
log_error_errno(errno, "Cannot open %s: %m", etc_machine_id);
return -errno;
return log_error_errno(errno,
"Cannot open %s: %m", etc_machine_id);
}
writable = false;