X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fmount.c;h=03eff9d9edc6b9c3da94d09fd473d5ea47716877;hb=71645acac27da55d510f2e4d61cc61b4e5b93035;hp=25bc7e197a12a066bded44d829aa0aeee505b474;hpb=b929bf049d33823dedb1ab2e2ac688cd341792fb;p=elogind.git diff --git a/src/core/mount.c b/src/core/mount.c index 25bc7e197..03eff9d9e 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -955,11 +955,11 @@ fail: void warn_if_dir_nonempty(const char *unit, const char* where) { if (dir_is_empty(where) > 0) return; - log_struct(LOG_NOTICE, + log_struct_unit(LOG_NOTICE, + unit, "MESSAGE=%s: Directory %s to mount over is not empty, mounting anyway.", unit, where, "WHERE=%s", where, - "_SYSTEMD_UNIT=%s", unit, MESSAGE_ID(SD_MESSAGE_OVERMOUNTING), NULL); } @@ -1888,13 +1888,15 @@ DEFINE_STRING_TABLE_LOOKUP(mount_result, MountResult); const UnitVTable mount_vtable = { .object_size = sizeof(Mount), - .exec_context_offset = offsetof(Mount, exec_context), .sections = "Unit\0" "Mount\0" "Install\0", + .exec_context_offset = offsetof(Mount, exec_context), + .exec_section = "Mount", + .no_alias = true, .no_instances = true,