chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bmfmt: allow passing more than one config file name
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 0ae964b648a9e56973cdda007708301ff39f2bc4..ed0f819c7ba71090449541b5f8cf904ce6eb6efe 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-189,7
+189,7
@@
static int mount_add_mount_links(Mount *m) {
if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0)
return r;
if ((r = unit_add_dependency(UNIT(n), UNIT_REQUIRES, UNIT(m), true)) < 0)
return r;
- } else if (pm && path_startswith(pm->what, n->where)) {
+ } else if (pm && p
m->what && p
ath_startswith(pm->what, n->where)) {
if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0)
return r;
if ((r = unit_add_dependency(UNIT(m), UNIT_AFTER, UNIT(n), true)) < 0)
return r;
@@
-197,7
+197,7
@@
static int mount_add_mount_links(Mount *m) {
if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0)
return r;
if ((r = unit_add_dependency(UNIT(m), UNIT_REQUIRES, UNIT(n), true)) < 0)
return r;
- } else if (pn && path_startswith(pn->what, m->where)) {
+ } else if (pn && p
n->what && p
ath_startswith(pn->what, m->where)) {
if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0)
return r;
if ((r = unit_add_dependency(UNIT(n), UNIT_AFTER, UNIT(m), true)) < 0)
return r;
@@
-271,7
+271,7
@@
static char* mount_test_option(const char *haystack, const char *needle) {
* struct mntent */
if (!haystack)
* struct mntent */
if (!haystack)
- return
false
;
+ return
NULL
;
zero(me);
me.mnt_opts = (char*) haystack;
zero(me);
me.mnt_opts = (char*) haystack;
@@
-1578,7
+1578,7
@@
static int mount_load_etc_fstab(Manager *m) {
free(what);
free(where);
free(what);
free(where);
- if (
r
< 0)
+ if (
k
< 0)
r = k;
}
r = k;
}