chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
coredump: simplify a few things by allocating small fields on the stack rather than...
[elogind.git]
/
src
/
core
/
machine-id-setup.c
diff --git
a/src/core/machine-id-setup.c
b/src/core/machine-id-setup.c
index ce6d8e02d05d50bf943dfee6c83e67ecb1d15cc3..671003820b77b2a815ddbf37a8b60be1ec096196 100644
(file)
--- a/
src/core/machine-id-setup.c
+++ b/
src/core/machine-id-setup.c
@@
-141,10
+141,8
@@
static int generate(char id[34], const char *root) {
/* If that didn't work, generate a random machine id */
r = sd_id128_randomize(&buf);
/* If that didn't work, generate a random machine id */
r = sd_id128_randomize(&buf);
- if (r < 0) {
- log_error("Failed to open /dev/urandom: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to open /dev/urandom: %m");
for (p = buf.bytes, q = id; p < buf.bytes + sizeof(buf); p++, q += 2) {
q[0] = hexchar(*p >> 4);
for (p = buf.bytes, q = id; p < buf.bytes + sizeof(buf); p++, q += 2) {
q[0] = hexchar(*p >> 4);
@@
-198,7
+196,7
@@
int machine_id_setup(const char *root) {
"2) /etc/machine-id exists and is empty.\n"
"3) /etc/machine-id is missing and /etc is writable.\n");
else
"2) /etc/machine-id exists and is empty.\n"
"3) /etc/machine-id is missing and /etc is writable.\n");
else
- log_error
(
"Cannot open %s: %m", etc_machine_id);
+ log_error
_errno(errno,
"Cannot open %s: %m", etc_machine_id);
return -errno;
}
return -errno;
}
@@
-206,10
+204,8
@@
int machine_id_setup(const char *root) {
}
}
}
}
- if (fstat(fd, &st) < 0) {
- log_error("fstat() failed: %m");
- return -errno;
- }
+ if (fstat(fd, &st) < 0)
+ return log_error_errno(errno, "fstat() failed: %m");
if (S_ISREG(st.st_mode))
if (loop_read(fd, id, 33, false) == 33 && id[32] == '\n') {
if (S_ISREG(st.st_mode))
if (loop_read(fd, id, 33, false) == 33 && id[32] == '\n') {
@@
-242,7
+238,7
@@
int machine_id_setup(const char *root) {
r = write_string_file(run_machine_id, id);
}
if (r < 0) {
r = write_string_file(run_machine_id, id);
}
if (r < 0) {
- log_error
("Cannot write %s: %s", run_machine_id, strerror(-r)
);
+ log_error
_errno(r, "Cannot write %s: %m", run_machine_id
);
unlink(run_machine_id);
return r;
}
unlink(run_machine_id);
return r;
}
@@
-250,7
+246,7
@@
int machine_id_setup(const char *root) {
/* And now, let's mount it over */
r = mount(run_machine_id, etc_machine_id, NULL, MS_BIND, NULL);
if (r < 0) {
/* And now, let's mount it over */
r = mount(run_machine_id, etc_machine_id, NULL, MS_BIND, NULL);
if (r < 0) {
- log_error
(
"Failed to mount %s: %m", etc_machine_id);
+ log_error
_errno(errno,
"Failed to mount %s: %m", etc_machine_id);
unlink_noerrno(run_machine_id);
return -errno;
}
unlink_noerrno(run_machine_id);
return -errno;
}
@@
-259,7
+255,7
@@
int machine_id_setup(const char *root) {
/* Mark the mount read-only */
if (mount(NULL, etc_machine_id, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0)
/* Mark the mount read-only */
if (mount(NULL, etc_machine_id, NULL, MS_BIND|MS_RDONLY|MS_REMOUNT, NULL) < 0)
- log_warning
(
"Failed to make transient %s read-only: %m", etc_machine_id);
+ log_warning
_errno(errno,
"Failed to make transient %s read-only: %m", etc_machine_id);
return 0;
}
return 0;
}