Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jb48852' into 'master'
Run qmf-accountscheck with privileges See merge request mer-core/messagingframework!38
- Loading branch information
Showing
3 changed files
with
53 additions
and
0 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
rpm/0022-Set-qmf-accountscheck-to-be-run-by-the-booster.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
From 995f7313993ced632e883aa0eec9a4db580fa340 Mon Sep 17 00:00:00 2001 | ||
From: David Llewellyn-Jones <david.llewellyn-jones@jolla.com> | ||
Date: Wed, 25 Mar 2020 11:59:52 +0200 | ||
Subject: [PATCH 22/22] Set qmf-accountscheck to be run by the booster | ||
|
||
In order for qmf-accountscheck to gain the privileges needed to read | ||
the accounts database, it must be invoked by the booster (it also needs | ||
a .privileges file, added elsewhere). | ||
|
||
This change sets the service file to use the booster. | ||
--- | ||
src/tools/systemd/messageserver5-accounts-check.service | 4 +++- | ||
src/tools/tools.pro | 2 ++ | ||
2 files changed, 5 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/tools/systemd/messageserver5-accounts-check.service b/src/tools/systemd/messageserver5-accounts-check.service | ||
index c2ec29ea..f5194daa 100644 | ||
--- a/src/tools/systemd/messageserver5-accounts-check.service | ||
+++ b/src/tools/systemd/messageserver5-accounts-check.service | ||
@@ -1,12 +1,14 @@ | ||
[Unit] | ||
Description=check accounts for messageserver5 | ||
+Requires=booster-qt5.service | ||
After=oneshot-user.service | ||
After=jolla-settings-accounts-update.service | ||
Before=messageserver5.service | ||
+After=booster-qt5.service | ||
|
||
[Service] | ||
Type=oneshot | ||
-ExecStart=/usr/bin/qmf-accountscheck | ||
+ExecStart=/usr/bin/invoker -o --type=generic --global-syms /usr/bin/qmf-accountscheck | ||
|
||
[Install] | ||
WantedBy=user-session.target | ||
diff --git a/src/tools/tools.pro b/src/tools/tools.pro | ||
index 689ad320..15aa630e 100644 | ||
--- a/src/tools/tools.pro | ||
+++ b/src/tools/tools.pro | ||
@@ -4,3 +4,5 @@ SUBDIRS = messageserver | ||
contains(DEFINES,USE_ACCOUNTS_QT) { | ||
SUBDIRS += accountscheck | ||
} | ||
+ | ||
+OTHER_FILES += systemd/*.service | ||
-- | ||
2.25.0 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
/usr/bin/qmf-accountscheck,a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters