Commit 64e3ce25 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb43396' into 'master'

[udisks2] Allow rescan for inactive. Contributes to JB#43396

See merge request !19
parents d4af9425 ddfe8d27
From 3b0df7a516a1523f96f43b906a470ad1de80c1a1 Mon Sep 17 00:00:00 2001
From bae0c3e0cf68922829d1d55f3e910f4fdeba390f Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 5 Dec 2017 11:17:50 +0200
Subject: [PATCH 1/9] Disable libblockdev-mdraid and part support from source
Subject: [PATCH 01/10] Disable libblockdev-mdraid and part support from source
tree
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From 1eefa406578f85320a7b2e0b488c914814155c34 Mon Sep 17 00:00:00 2001
From d16ccca1c503badece76d462e524c5d530fb8c64 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Thu, 7 Dec 2017 13:15:34 +0200
Subject: [PATCH 2/9] Drop smartata dependencies
Subject: [PATCH 02/10] Drop smartata dependencies
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 71a5b663652054e81e7f6e671f257e349a0fcf4e Mon Sep 17 00:00:00 2001
From 83e732433500be755af56a18488d17dbaf32992b Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 6 Feb 2018 14:01:16 +0200
Subject: [PATCH 3/9] Loosen up polkit policies to work from another seat
Subject: [PATCH 03/10] Loosen up polkit policies to work from another seat
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 171d5879207b5e72c14a2b06a33dea157de01882 Mon Sep 17 00:00:00 2001
From aa7d4e7e5397fd3fe527f66bd793d3716fa13f8c Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 6 Feb 2018 14:08:59 +0200
Subject: [PATCH 4/9] Introduce mount-sd service that is executed as nemo
Subject: [PATCH 04/10] Introduce mount-sd service that is executed as nemo
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 25ad885b47243abcfd5d796d8a68f29c9431c67b Mon Sep 17 00:00:00 2001
From 511431a281d8949d9da40537d4cf0d508e577584 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Mon, 12 Mar 2018 10:18:03 +0200
Subject: [PATCH 5/9] Add udev rule for the sda drives
Subject: [PATCH 05/10] Add udev rule for the sda drives
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From 40af3ef886ae4d069ded42d282033dbc4fd6fae8 Mon Sep 17 00:00:00 2001
From 17ceca1b69a8639fa3ada7b93a7ba2666e4fa072 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 11 Apr 2018 11:11:53 +0300
Subject: [PATCH 6/9] Disable zram rule for now
Subject: [PATCH 06/10] Disable zram rule for now
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From ec9e62b03aab73427a6b290fd5140134f4526ac8 Mon Sep 17 00:00:00 2001
From 9ce374eb82c4cebc0f24d2f4746ebbf9e78df12f Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 18 Apr 2018 18:00:00 +0300
Subject: [PATCH 7/9] Create mount path with 755 rights
Subject: [PATCH 07/10] Create mount path with 755 rights
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
......
From faf545a45093c492fbc9cc40b18e63675bcf1e89 Mon Sep 17 00:00:00 2001
From a22976986045a7af66c2d1985b5ae8d21fe9e5f4 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Tue, 18 Sep 2018 17:04:36 +0300
Subject: [PATCH 8/9] Make it possible to encrypt mmcblk* (format with
Subject: [PATCH 08/10] Make it possible to encrypt mmcblk* (format with
encryption)
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From e63cbc17f8afcc2f99c45150bbd366a8dccc5199 Mon Sep 17 00:00:00 2001
From 2cadb944916c23d290320076f13b420f65cb3a12 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 21 Nov 2018 17:27:59 +0200
Subject: [PATCH 9/9] Reduce reserved blocks percentage to zero for
Subject: [PATCH 09/10] Reduce reserved blocks percentage to zero for
ext2/ext3/ext4 formatting
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
......
From 4c2e802eb6afa9040dba04c175e0724d7ae00ff3 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Wed, 21 Nov 2018 17:04:27 +0200
Subject: [PATCH 10/10] Allow rescan for inactive
Signed-off-by: Raine Makelainen <raine.makelainen@jolla.com>
---
data/org.freedesktop.UDisks2.policy.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/org.freedesktop.UDisks2.policy.in b/data/org.freedesktop.UDisks2.policy.in
index eaf13908..e5af21c1 100644
--- a/data/org.freedesktop.UDisks2.policy.in
+++ b/data/org.freedesktop.UDisks2.policy.in
@@ -340,7 +340,7 @@
<_message>Authentication is required to rescan a device</_message>
<defaults>
<allow_any>auth_admin</allow_any>
- <allow_inactive>auth_admin</allow_inactive>
+ <allow_inactive>yes</allow_inactive>
<allow_active>yes</allow_active>
</defaults>
</action>
--
2.17.2
......@@ -23,6 +23,7 @@ Patch6: 0006-Disable-zram-rule-for-now.patch
Patch7: 0007-Create-mount-path-with-755-rights.patch
Patch8: 0008-Make-it-possible-to-encrypt-mmcblk-format-with-encry.patch
Patch9: 0009-Reduce-reserved-blocks-percentage-to-zero-for-ext2-e.patch
Patch10: 0010-Allow-rescan-for-inactive.patch
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
......@@ -115,6 +116,7 @@ dynamic library, which provides access to the udisksd daemon.
%patch7 -p1 -b .mount-path-rights
%patch8 -p1 -b .mmcblk-encryption
%patch9 -p1 -b .mkfs-reserved-blocks-percentage
%patch10 -p1 -b .allow-rescan
%build
# Disable gtk-doc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment