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

diff --git a/src/automount.c b/src/automount.c
index da66630fd..f6f83d43b 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -154,7 +154,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 +244,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 +305,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 +573,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 +583,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;
         }