X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=automount.c;h=c28472da769106f1ff61f6d633094f257d3552b5;hp=5d4a240aa4a98f52bdcffdad406a52b9db1c6a73;hb=a90ebccc072efa17313fe68c737b3507247c37dd;hpb=f50e0a012340fa8dfe6ec7f0cd869f5f3a052d7a

diff --git a/automount.c b/automount.c
index 5d4a240aa..c28472da7 100644
--- a/automount.c
+++ b/automount.c
@@ -1,14 +1,32 @@
 /*-*- Mode: C; c-basic-offset: 8 -*-*/
 
+/***
+  This file is part of systemd.
+
+  Copyright 2010 Lennart Poettering
+
+  systemd is free software; you can redistribute it and/or modify it
+  under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+
+  systemd is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
 
 #include "unit.h"
 #include "automount.h"
 #include "load-fragment.h"
-#include "load-fstab.h"
 #include "load-dropin.h"
 
-static int automount_init(Unit *u) {
+static int automount_init(Unit *u, UnitLoadState *new_state) {
         int r;
         Automount *a = AUTOMOUNT(u);
 
@@ -17,13 +35,28 @@ static int automount_init(Unit *u) {
         exec_context_init(&a->exec_context);
 
         /* Load a .automount file */
-        if ((r = unit_load_fragment(u)) < 0)
+        if ((r = unit_load_fragment(u, new_state)) < 0)
                 return r;
 
+        if (*new_state == UNIT_STUB)
+                *new_state = UNIT_LOADED;
+
         /* Load drop-in directory data */
-        if ((r = unit_load_dropin(u)) < 0)
+        if ((r = unit_load_dropin(unit_follow_merge(u))) < 0)
                 return r;
 
+        if (*new_state == UNIT_LOADED) {
+
+                if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount))) < 0)
+                        return r;
+
+                if ((r = unit_add_exec_dependencies(u, &a->exec_context)) < 0)
+                        return r;
+
+                if ((r = unit_add_default_cgroup(u)) < 0)
+                        return r;
+        }
+
         return 0;
 }