chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
backlight: add minimal tool to save/restore screen brightness across reboots
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 3cc3e65b234a9cd867887c8883a66c127e4f9930..c7d29b0c887b4b5082c689fa92dfd8e66f10164d 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);
@@
-1543,7
+1543,8
@@
static int mount_add_one(
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- if (!path_equal(where, "/")) {
+ if (!path_equal(where, "/") &&
+ !path_equal(where, "/usr")) {
r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
if (r < 0)
goto fail;
r = unit_add_dependency_by_name(u, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true);
if (r < 0)
goto fail;