if (r > 0)
return;
else if (r == 0)
- log_unit_struct(LOG_NOTICE,
- unit,
- "MESSAGE=%s: Directory %s to mount over is not empty, mounting anyway.",
- unit, where,
+ log_unit_struct(unit,
+ LOG_NOTICE,
+ LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
+ LOG_MESSAGE("%s: Directory %s to mount over is not empty, mounting anyway.",
+ unit, where),
"WHERE=%s", where,
- MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
NULL);
else
log_unit_warning(unit,
assert(where);
if (is_symlink(where) > 0) {
- log_unit_struct(LOG_WARNING,
- unit,
- "MESSAGE=%s: Mount on symlink %s not allowed.",
- unit, where,
+ log_unit_struct(unit,
+ LOG_ERR,
+ LOG_MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
+ LOG_MESSAGE("%s: Mount on symlink %s not allowed.",
+ unit, where),
"WHERE=%s", where,
- MESSAGE_ID(SD_MESSAGE_OVERMOUNTING),
NULL);
return -ELOOP;
r = mount_load_proc_self_mountinfo(m, true);
if (r < 0) {
- log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r));
+ log_error_errno(r, "Failed to reread /proc/self/mountinfo: %m");
/* Reset flags, just in case, for later calls */
LIST_FOREACH(units_by_type, u, m->units_by_type[UNIT_MOUNT]) {