chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
unit: use weaker dependencies between mount and device units in --user mode
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index f944c02e2bea7001bb922eebc4dc6c51d2a851a6..40037e7866e01d16893e9908c73f2c9252976ffc 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-21,7
+21,6
@@
#include <errno.h>
#include <stdio.h>
#include <errno.h>
#include <stdio.h>
-#include <mntent.h>
#include <sys/epoll.h>
#include <signal.h>
#include <libmount.h>
#include <sys/epoll.h>
#include <signal.h>
#include <libmount.h>
@@
-30,8
+29,6
@@
#include "manager.h"
#include "unit.h"
#include "mount.h"
#include "manager.h"
#include "unit.h"
#include "mount.h"
-#include "load-fragment.h"
-#include "load-dropin.h"
#include "log.h"
#include "sd-messages.h"
#include "strv.h"
#include "log.h"
#include "sd-messages.h"
#include "strv.h"
@@
-41,9
+38,7
@@
#include "unit-name.h"
#include "dbus-mount.h"
#include "special.h"
#include "unit-name.h"
#include "dbus-mount.h"
#include "special.h"
-#include "bus-common-errors.h"
#include "exit-status.h"
#include "exit-status.h"
-#include "def.h"
#include "fstab-util.h"
#define RETRY_UMOUNT_MAX 32
#include "fstab-util.h"
#define RETRY_UMOUNT_MAX 32
@@
-300,7
+295,7
@@
static int mount_add_device_links(Mount *m) {
assert(m);
assert(m);
- p = get_mount_parameters
_fragment
(m);
+ p = get_mount_parameters(m);
if (!p)
return 0;
if (!p)
return 0;
@@
-976,7
+971,7
@@
static void mount_enter_remounting(Mount *m) {
const char *o;
if (m->parameters_fragment.options)
const char *o;
if (m->parameters_fragment.options)
- o = str
append
a("remount,", m->parameters_fragment.options);
+ o = str
join
a("remount,", m->parameters_fragment.options);
else
o = "remount";
else
o = "remount";
@@
-1037,7
+1032,7
@@
static int mount_start(Unit *u) {
m->reload_result = MOUNT_SUCCESS;
mount_enter_mounting(m);
m->reload_result = MOUNT_SUCCESS;
mount_enter_mounting(m);
- return
0
;
+ return
1
;
}
static int mount_stop(Unit *u) {
}
static int mount_stop(Unit *u) {
@@
-1061,7
+1056,7
@@
static int mount_stop(Unit *u) {
m->state == MOUNT_REMOUNTING_SIGKILL);
mount_enter_unmounting(m);
m->state == MOUNT_REMOUNTING_SIGKILL);
mount_enter_unmounting(m);
- return
0
;
+ return
1
;
}
static int mount_reload(Unit *u) {
}
static int mount_reload(Unit *u) {