Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb53330' into 'master'
[udisks2] Always mount filesystems using the UUID instead of label. Contributes to JB#53330

See merge request mer-core/udisks2!28
  • Loading branch information
Matti Kosola committed Mar 16, 2021
2 parents 48e4596 + 694030d commit 98707fa
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 0 deletions.
@@ -0,0 +1,38 @@
From 691a56727565cc5425df86d995cd740e89cc3aa6 Mon Sep 17 00:00:00 2001
From: Franz-Josef Haider <franz.haider@jolla.com>
Date: Mon, 15 Mar 2021 13:29:59 +0000
Subject: [PATCH 14/14] Always mount filesystems using the UUID instead of
label.

---
src/udiskslinuxfilesystem.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/udiskslinuxfilesystem.c b/src/udiskslinuxfilesystem.c
index 9ceec385..453bd528 100644
--- a/src/udiskslinuxfilesystem.c
+++ b/src/udiskslinuxfilesystem.c
@@ -1086,6 +1086,9 @@ calculate_mount_point (UDisksDaemon *daemon,
*
* See http://en.wikipedia.org/wiki/UTF-8 for details.
*/
+#if 1
+ (void)label;
+#else
if (label != NULL && strlen (label) > 0)
{
str = g_string_new (NULL);
@@ -1102,7 +1105,9 @@ calculate_mount_point (UDisksDaemon *daemon,
mount_point = g_string_free (str, FALSE);
g_free (s);
}
- else if (uuid != NULL && strlen (uuid) > 0)
+ else
+#endif
+ if (uuid != NULL && strlen (uuid) > 0)
{
str = g_string_new (NULL);
g_string_append_printf (str, "%s/", mount_dir);
--
2.26.2

1 change: 1 addition & 0 deletions rpm/udisks2.spec
Expand Up @@ -29,6 +29,7 @@ Patch10: 0010-Allow-rescan-for-inactive.patch
Patch11: 0011-Allow-whitelisting-filesystems-that-can-be-mounted.patch
Patch12: 0012-Add-option-to-set-group-permissions.patch
Patch13: 0013-Pass-extra-mount-options-to-mount-sd-service.patch
Patch14: 0014-Always-mount-filesystems-using-the-UUID-instead-of-l.patch

BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
Expand Down

0 comments on commit 98707fa

Please sign in to comment.