From 46a84d077252ef642690837608008f78f51dcbbd Mon Sep 17 00:00:00 2001
From: Mike Salmela <mike.salmela@jolla.com>
Date: Tue, 4 Aug 2020 11:03:16 +0300
Subject: [PATCH] [nemo-systemsettings] Set group permissions when formating
 memory card. Fixes JB#50288

---
 rpm/nemo-qml-plugin-systemsettings.spec | 1 +
 src/partitionmodel.cpp                  | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/rpm/nemo-qml-plugin-systemsettings.spec b/rpm/nemo-qml-plugin-systemsettings.spec
index 1819058..29f8d9b 100644
--- a/rpm/nemo-qml-plugin-systemsettings.spec
+++ b/rpm/nemo-qml-plugin-systemsettings.spec
@@ -12,6 +12,7 @@ Requires:       mce >= 1.83.0
 Requires:       libsailfishkeyprovider >= 0.0.14
 Requires:       connman-qt5 >= 1.2.21
 Requires:       user-managerd >= 0.4.0
+Requires:       udisks2 >= 2.8.1+git6
 Requires(post): coreutils
 BuildRequires:  pkgconfig(Qt5Qml)
 BuildRequires:  pkgconfig(Qt5SystemInfo)
diff --git a/src/partitionmodel.cpp b/src/partitionmodel.cpp
index 06d8ef3..0791936 100644
--- a/src/partitionmodel.cpp
+++ b/src/partitionmodel.cpp
@@ -175,6 +175,8 @@ void PartitionModel::format(const QString &devicePath, const QVariantMap &argume
     args.insert(QLatin1String("label"), arguments.value(QLatin1String("label"), QString()).toString());
     args.insert(QLatin1String("no-block"), true);
     args.insert(QLatin1String("take-ownership"), true);
+    // set-group-permissions is a custom option patched into udisks2 (JB#50288)
+    args.insert(QLatin1String("set-group-permissions"), true);
     args.insert(QLatin1String("update-partition-type"), true);
     args.insert(QLatin1String("auto-mount"), arguments.value(QLatin1String("auto-mount"), false).toBool());