chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'kay/master'
[elogind.git]
/
automount.c
diff --git
a/automount.c
b/automount.c
index eb9c3d3c1d3071d2ed95e0e09d95afca5227c45b..624bd24349f58f2ea2019e8016850c479e30651e 100644
(file)
--- a/
automount.c
+++ b/
automount.c
@@
-5,7
+5,6
@@
#include "unit.h"
#include "automount.h"
#include "load-fragment.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) {
#include "load-dropin.h"
static int automount_init(Unit *u) {
@@
-20,10
+19,6
@@
static int automount_init(Unit *u) {
if ((r = unit_load_fragment(u)) < 0)
return r;
if ((r = unit_load_fragment(u)) < 0)
return r;
- /* Load entry from /etc/fstab */
- if ((r = unit_load_fstab(u)) < 0)
- return r;
-
/* Load drop-in directory data */
if ((r = unit_load_dropin(u)) < 0)
return r;
/* Load drop-in directory data */
if ((r = unit_load_dropin(u)) < 0)
return r;