X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fautomount.c;h=51fa0030dd5a999fbdabb5040c6251884a71c5f1;hp=7289311684caff948922999bb420b157a7191b0f;hb=91f9dcaf9270fe465525638cc08bd94590273349;hpb=c904f64d84db8c4eebedf210ba10893f19ba05ed

diff --git a/src/automount.c b/src/automount.c
index 728931168..51fa0030d 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -58,6 +58,8 @@ static void automount_init(Unit *u) {
         a->pipe_watch.type = WATCH_INVALID;
 
         a->directory_mode = 0755;
+
+        a->meta.ignore_on_isolate = true;
 }
 
 static void repeat_unmout(const char *path) {
@@ -140,7 +142,7 @@ static int automount_add_mount_links(Automount *a) {
 
         assert(a);
 
-        LIST_FOREACH(units_per_type, other, a->meta.manager->units_per_type[UNIT_MOUNT])
+        LIST_FOREACH(units_by_type, other, a->meta.manager->units_by_type[UNIT_MOUNT])
                 if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
                         return r;
 
@@ -305,7 +307,7 @@ static int open_dev_autofs(Manager *m) {
         if (m->dev_autofs_fd >= 0)
                 return m->dev_autofs_fd;
 
-	label_fix("/dev/autofs", false);
+        label_fix("/dev/autofs", false);
 
         if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
                 log_error("Failed to open /dev/autofs: %s", strerror(errno));
@@ -583,7 +585,7 @@ static void automount_enter_runnning(Automount *a) {
 
         /* Before we do anything, let's see if somebody is playing games with us? */
         if (lstat(a->where, &st) < 0) {
-                log_warning("%s failed stat automount point: %m", a->meta.id);
+                log_warning("%s failed to stat automount point: %m", a->meta.id);
                 goto fail;
         }