X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=automount.c;h=a45cd9650558ba6105fe1c2caad72de9f7cb7b18;hb=65d2ebdc3408c81a947de8712b37b9398d955465;hp=7b397c9b9bfbd73b89d36806b9317aeb3b1300f9;hpb=87f0e418cf2c58b3201d06a60e3696ec672d2662;p=elogind.git
diff --git a/automount.c b/automount.c
index 7b397c9b9..a45cd9650 100644
--- a/automount.c
+++ b/automount.c
@@ -1,11 +1,29 @@
/*-*- 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 .
+***/
+
#include
#include "unit.h"
#include "automount.h"
#include "load-fragment.h"
-#include "load-fstab.h"
#include "load-dropin.h"
static int automount_init(Unit *u) {
@@ -17,11 +35,7 @@ static int automount_init(Unit *u) {
exec_context_init(&a->exec_context);
/* Load a .automount file */
- if ((r = unit_load_fragment(u)) < 0 && errno != -ENOENT)
- return r;
-
- /* Load entry from /etc/fstab */
- if ((r = unit_load_fstab(u)) < 0)
+ if ((r = unit_load_fragment(u)) < 0)
return r;
/* Load drop-in directory data */