|
 |
a52f674 |
From 672f89e96aa251c3174d340541609e100882172c Mon Sep 17 00:00:00 2001
|
|
|
a52f674 |
From: Lennart Poettering <lennart@poettering.net>
|
|
|
a52f674 |
Date: Wed, 26 Feb 2014 04:28:37 +0100
|
|
|
a52f674 |
Subject: [PATCH] mount: don't fire PropertiesChanged signals for mounts that
|
|
|
a52f674 |
are stopped
|
|
|
a52f674 |
|
|
|
a52f674 |
(cherry picked from commit aef831369cd2a7a1bd4a58dd96ff8628ed6a85f9)
|
|
|
a52f674 |
---
|
|
|
a52f674 |
src/core/mount.c | 9 ++++++---
|
|
|
a52f674 |
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
a52f674 |
|
|
|
a52f674 |
diff --git a/src/core/mount.c b/src/core/mount.c
|
|
|
a52f674 |
index 0a0ef82..65ea3f9 100644
|
|
|
a52f674 |
--- a/src/core/mount.c
|
|
|
a52f674 |
+++ b/src/core/mount.c
|
|
|
a52f674 |
@@ -1691,20 +1691,20 @@ void mount_fd_event(Manager *m, int events) {
|
|
|
a52f674 |
Mount *mount = MOUNT(u);
|
|
|
a52f674 |
|
|
|
a52f674 |
if (!mount->is_mounted) {
|
|
|
a52f674 |
- /* This has just been unmounted. */
|
|
|
a52f674 |
|
|
|
a52f674 |
mount->from_proc_self_mountinfo = false;
|
|
|
a52f674 |
|
|
|
a52f674 |
switch (mount->state) {
|
|
|
a52f674 |
|
|
|
a52f674 |
case MOUNT_MOUNTED:
|
|
|
a52f674 |
+ /* This has just been unmounted by
|
|
|
a52f674 |
+ * somebody else, follow the state
|
|
|
a52f674 |
+ * change. */
|
|
|
a52f674 |
mount_enter_dead(mount, MOUNT_SUCCESS);
|
|
|
a52f674 |
break;
|
|
|
a52f674 |
|
|
|
a52f674 |
default:
|
|
|
a52f674 |
- mount_set_state(mount, mount->state);
|
|
|
a52f674 |
break;
|
|
|
a52f674 |
-
|
|
|
a52f674 |
}
|
|
|
a52f674 |
|
|
|
a52f674 |
} else if (mount->just_mounted || mount->just_changed) {
|
|
|
a52f674 |
@@ -1715,6 +1715,9 @@ void mount_fd_event(Manager *m, int events) {
|
|
|
a52f674 |
|
|
|
a52f674 |
case MOUNT_DEAD:
|
|
|
a52f674 |
case MOUNT_FAILED:
|
|
|
a52f674 |
+ /* This has just been mounted by
|
|
|
a52f674 |
+ * somebody else, follow the state
|
|
|
a52f674 |
+ * change. */
|
|
|
a52f674 |
mount_enter_mounted(mount, MOUNT_SUCCESS);
|
|
|
a52f674 |
break;
|
|
|
a52f674 |
|