50 lines
1.9 KiB
Diff
50 lines
1.9 KiB
Diff
From 3a144cfb90e6c0c6586a976138fc8e472b90bbaf Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 26 Feb 2014 04:28:37 +0100
|
|
Subject: [PATCH] mount: don't fire PropertiesChanged signals for mounts that
|
|
are stopped
|
|
|
|
(cherry picked from commit aef831369cd2a7a1bd4a58dd96ff8628ed6a85f9)
|
|
---
|
|
src/core/mount.c | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/src/core/mount.c b/src/core/mount.c
|
|
index 75b133b..68b2e83 100644
|
|
--- a/src/core/mount.c
|
|
+++ b/src/core/mount.c
|
|
@@ -1676,20 +1676,20 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
|
|
Mount *mount = MOUNT(u);
|
|
|
|
if (!mount->is_mounted) {
|
|
- /* This has just been unmounted. */
|
|
|
|
mount->from_proc_self_mountinfo = false;
|
|
|
|
switch (mount->state) {
|
|
|
|
case MOUNT_MOUNTED:
|
|
+ /* This has just been unmounted by
|
|
+ * somebody else, follow the state
|
|
+ * change. */
|
|
mount_enter_dead(mount, MOUNT_SUCCESS);
|
|
break;
|
|
|
|
default:
|
|
- mount_set_state(mount, mount->state);
|
|
break;
|
|
-
|
|
}
|
|
|
|
} else if (mount->just_mounted || mount->just_changed) {
|
|
@@ -1700,6 +1700,9 @@ static int mount_dispatch_io(sd_event_source *source, int fd, uint32_t revents,
|
|
|
|
case MOUNT_DEAD:
|
|
case MOUNT_FAILED:
|
|
+ /* This has just been mounted by
|
|
+ * somebody else, follow the state
|
|
+ * change. */
|
|
mount_enter_mounted(mount, MOUNT_SUCCESS);
|
|
break;
|
|
|