journal: when the same entry is in two files, skip over them in sync

[elogind.git] / src / automount.c

diff --git a/src/automount.c b/src/automount.c
index 16babd1fa446399d1b839377966424072c90f345..6cf3c311b3995e3c0114060d9c067fb09399c1be 100644 (file)
--- a/src/automount.c
+++ b/src/automount.c
@@ -611,7 +611,7 @@ static int automount_start(Unit *u) {
 
         assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
 
-        if (path_is_mount_point(a->where)) {
+        if (path_is_mount_point(a->where, false)) {
                 log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id);
                 return -EEXIST;
         }
@@ -770,7 +770,7 @@ static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
                 if (packet.v5_packet.pid > 0) {
                         char *p = NULL;
 
-                        get_process_name(packet.v5_packet.pid, &p);
+                        get_process_comm(packet.v5_packet.pid, &p);
                         log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
                         free(p);