chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
shutdown: add missing include
[elogind.git]
/
src
/
core
/
mount.c
diff --git
a/src/core/mount.c
b/src/core/mount.c
index 69cb6e24e4b23861b07ea8664de3c7befb889afa..15d5f215303376c40a688f9c2dada51fdac2e591 100644
(file)
--- a/
src/core/mount.c
+++ b/
src/core/mount.c
@@
-687,8
+687,10
@@
static void mount_set_state(Mount *m, MountState state) {
state == MOUNT_REMOUNTING_SIGKILL ||
state == MOUNT_UNMOUNTING_SIGTERM ||
state == MOUNT_UNMOUNTING_SIGKILL ||
state == MOUNT_REMOUNTING_SIGKILL ||
state == MOUNT_UNMOUNTING_SIGTERM ||
state == MOUNT_UNMOUNTING_SIGKILL ||
- state == MOUNT_FAILED)
- mount_notify_automount(m, -ENODEV);
+ state == MOUNT_FAILED) {
+ if (state != old_state)
+ mount_notify_automount(m, -ENODEV);
+ }
if (state != old_state)
log_debug("%s changed %s -> %s",
if (state != old_state)
log_debug("%s changed %s -> %s",
@@
-1532,7
+1534,7
@@
static int mount_load_proc_self_mountinfo(Manager *m, bool set_flags) {
goto clean_up;
}
goto clean_up;
}
- o = join(options, ",", options2, NULL);
+ o =
str
join(options, ",", options2, NULL);
if (!o) {
r = -ENOMEM;
goto finish;
if (!o) {
r = -ENOMEM;
goto finish;