chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core/mount.c:mount_dump(): don't segfault, if mount is not mounted anymore
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index c1af903b124cbe0bd58dcf32d8a5ce71a4dbd2eb..58a3f1160ff5fa3e145d8a683273e4a0afef57c1 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-822,9
+822,9
@@
static void mount_dump(Unit *u, FILE *f, const char *prefix) {
prefix, mount_state_to_string(m->state),
prefix, mount_result_to_string(m->result),
prefix, m->where,
prefix, mount_state_to_string(m->state),
prefix, mount_result_to_string(m->result),
prefix, m->where,
- prefix,
strna(p->what)
,
- prefix,
strna(p->fstype)
,
- prefix,
strna(p->options)
,
+ prefix,
p ? strna(p->what) : "n/a"
,
+ prefix,
p ? strna(p->fstype) : "n/a"
,
+ prefix,
p ? strna(p->options) : "n/a"
,
prefix, yes_no(m->from_proc_self_mountinfo),
prefix, yes_no(m->from_fragment),
prefix, m->directory_mode);
prefix, yes_no(m->from_proc_self_mountinfo),
prefix, yes_no(m->from_fragment),
prefix, m->directory_mode);
@@
-1562,7
+1562,7
@@
static int mount_add_one(
}
}
}
}
- if (u->load_state == UNIT_
ERROR
) {
+ if (u->load_state == UNIT_
NOT_FOUND
) {
u->load_state = UNIT_LOADED;
u->load_error = 0;
u->load_state = UNIT_LOADED;
u->load_error = 0;