Merge branch 'jb50288' into 'master'

[nemo-systemsettings] Set group permissions when formating memory card. Fixes JB#50288 See merge request mer-core/nemo-qml-plugin-systemsettings!150
sailfishos · Aug 4, 2020 · 7bb6d97 · 7bb6d97
2 parents ad50938 + 46a84d0
commit 7bb6d97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -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());