You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
53 lines
1.7 KiB
53 lines
1.7 KiB
From 659b97b93d93ad05732831f6f097cf6f2a9c6410 Mon Sep 17 00:00:00 2001 |
|
From: David Tardon <dtardon@redhat.com> |
|
Date: Mon, 16 Mar 2020 09:37:22 +0100 |
|
Subject: [PATCH] fix the fix for #1691511 |
|
|
|
The fix for #1691511 should have been used only for existing mounts |
|
(mount_setup_existing_unit() in current master). |
|
|
|
(cherry picked from commit 4584818bea998d257a166c238b829025b6138e55) |
|
|
|
Related: #1809159 |
|
--- |
|
src/core/mount.c | 6 +++++- |
|
1 file changed, 5 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/src/core/mount.c b/src/core/mount.c |
|
index 34c4b548ad..56fda1b73f 100644 |
|
--- a/src/core/mount.c |
|
+++ b/src/core/mount.c |
|
@@ -1416,6 +1416,7 @@ static int mount_setup_unit( |
|
bool load_extras = false; |
|
MountParameters *p; |
|
bool delete, changed = false; |
|
+ bool just_mounted; |
|
Unit *u; |
|
int r; |
|
|
|
@@ -1489,6 +1490,7 @@ static int mount_setup_unit( |
|
* loaded in now. */ |
|
unit_add_to_load_queue(u); |
|
changed = true; |
|
+ just_mounted = true; |
|
} else { |
|
delete = false; |
|
|
|
@@ -1518,6 +1520,8 @@ static int mount_setup_unit( |
|
load_extras = true; |
|
changed = true; |
|
} |
|
+ |
|
+ just_mounted = !MOUNT(u)->from_proc_self_mountinfo || MOUNT(u)->just_mounted; |
|
} |
|
|
|
w = strdup(what); |
|
@@ -1537,7 +1541,7 @@ static int mount_setup_unit( |
|
|
|
if (set_flags) { |
|
MOUNT(u)->is_mounted = true; |
|
- MOUNT(u)->just_mounted = !MOUNT(u)->from_proc_self_mountinfo || MOUNT(u)->just_mounted; |
|
+ MOUNT(u)->just_mounted = just_mounted; |
|
MOUNT(u)->just_changed = changed; |
|
} |
|
|
|
|