X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fautomount.c;h=6cf3c311b3995e3c0114060d9c067fb09399c1be;hb=94fb446e55babb713fb24850455627acf30d999b;hp=da66630fd6b083bc2e1bc769ffdce0b6ec8b1926;hpb=941a4041bdb9d91e9d5033005263efe029621e4f;p=elogind.git

diff --git a/src/automount.c b/src/automount.c
index da66630fd..6cf3c311b 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;
 
@@ -154,7 +156,10 @@ static int automount_add_default_dependencies(Automount *a) {
 
         if (a->meta.manager->running_as == MANAGER_SYSTEM) {
 
-                if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTED_BY, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+                if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
+                        return r;
+
+                if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
                         return r;
         }
 
@@ -241,7 +246,7 @@ static void automount_set_state(Automount *a, AutomountState state) {
                           automount_state_to_string(old_state),
                           automount_state_to_string(state));
 
-        unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state]);
+        unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state], true);
 }
 
 static int automount_coldplug(Unit *u) {
@@ -302,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");
+        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));
@@ -570,7 +575,8 @@ static void automount_enter_runnning(Automount *a) {
 
         /* We don't take mount requests anymore if we are supposed to
          * shut down anyway */
-        if (a->meta.job && a->meta.job->type == JOB_STOP) {
+        if (unit_pending_inactive(UNIT(a))) {
+                log_debug("Suppressing automount request on %s since unit stop is scheduled.", a->meta.id);
                 automount_send_ready(a, -EHOSTDOWN);
                 return;
         }
@@ -579,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;
         }
 
@@ -605,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;
         }
@@ -764,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);
 
@@ -825,6 +831,10 @@ DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState);
 
 const UnitVTable automount_vtable = {
         .suffix = ".automount",
+        .sections =
+                "Unit\0"
+                "Automount\0"
+                "Install\0",
 
         .no_alias = true,
         .no_instances = true,