core: fix %h, %s, %p handling in templates in user session

[elogind.git] / src / core / automount.c

diff --git a/src/core/automount.c b/src/core/automount.c
index c9b87d5174e69b455d4ab72018efe41bc6b10acc..b1619a64e6d799bd8c712ca0633639935a35acab 100644 (file)
--- a/src/core/automount.c
+++ b/src/core/automount.c
@@ -156,7 +156,7 @@ static int automount_add_default_dependencies(Automount *a) {
 
         assert(a);
 
-        if (UNIT(a)->manager->running_as != MANAGER_SYSTEM)
+        if (UNIT(a)->manager->running_as != SYSTEMD_SYSTEM)
                 return 0;
 
         r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
@@ -502,7 +502,7 @@ static void automount_enter_waiting(Automount *a) {
         mkdir_p_label(a->where, 0555);
 
         if (dir_is_empty(a->where) <= 0)
-                log_notice("%s: Directory %s to mount over is not empty, ignoring. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", a->meta.id, a->where);
+                log_notice("%s: Directory %s to mount over is not empty, mounting anyway. (To see the over-mounted files, please manually mount the underlying file system to a secondary location.)", a->meta.id, a->where);
 
         if (pipe2(p, O_NONBLOCK|O_CLOEXEC) < 0) {
                 r = -errno;