From 8cdc5435f0b5815049bda5b7b4f08421b38a132e Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Sun, 29 May 2022 05:09:18 +0200
Subject: [PATCH 1/5] Update 96-cryptosd.rules

---
 udev/rules.d/96-cryptosd.rules | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/udev/rules.d/96-cryptosd.rules b/udev/rules.d/96-cryptosd.rules
index 5bd7add..fd199a3 100644
--- a/udev/rules.d/96-cryptosd.rules
+++ b/udev/rules.d/96-cryptosd.rules
@@ -13,12 +13,17 @@
 
 SUBSYSTEM!="block", GOTO="cryptosd_end"
 
-# Ignore the additions / changes by Jolla per
-# https://git.sailfishos.org/mer-core/udisks2/blob/master/rpm/0005-Add-udev-rule-for-the-sda-drives.patch
+# Ignore the additions / changes by Jolla before and after this commit / PR 4
+# https://github.com/sailfishos/udisks2/pull/4/files
 # by setting these anew / clobbering these for *all suitable* devices.
 KERNEL=="mmcblk[1-9]*", ENV{DEVTYPE}=="disk", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{DEVTYPE}=="disk", ATTR{queue/rotational}=="0", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
+# Do not try to handle (i.e., to auto-mount) internal eMMC (ToDo: in the future also UFS & NVMe) devices with either boot areas or RPMBs:
+KERNEL=="mmcblk1", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="??*", ENV{CRYPTOSD_NO}="%k"
+KERNEL=="mmcblk1", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="???*", ENV{CRYPTOSD_NO}="%k"
+KERNEL=="%E{CRYPTOSD_NO}*", GOTO="cryptosd_end"
+
 # Set power control / UDISKS_CAN_POWER_OFF for all devices dealt with, here: This is also supported for partitions, not only disks!?!
 # KERNEL=="mmcblk[1-9]*", ATTR{power/control}=="off", ATTR{power/control}="auto"
 # SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ATTR{power/control}=="off", ATTR{power/control}="auto"

From 7167de55ded461ca08b408fc82893bb3b05605f4 Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Sun, 29 May 2022 05:56:31 +0200
Subject: [PATCH 2/5] Update 96-cryptosd.rules

---
 udev/rules.d/96-cryptosd.rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/udev/rules.d/96-cryptosd.rules b/udev/rules.d/96-cryptosd.rules
index fd199a3..289361f 100644
--- a/udev/rules.d/96-cryptosd.rules
+++ b/udev/rules.d/96-cryptosd.rules
@@ -20,9 +20,10 @@ KERNEL=="mmcblk[1-9]*", ENV{DEVTYPE}=="disk", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{DEVTYPE}=="disk", ATTR{queue/rotational}=="0", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
 # Do not try to handle (i.e., to auto-mount) internal eMMC (ToDo: in the future also UFS & NVMe) devices with either boot areas or RPMBs:
-KERNEL=="mmcblk1", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="??*", ENV{CRYPTOSD_NO}="%k"
-KERNEL=="mmcblk1", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="???*", ENV{CRYPTOSD_NO}="%k"
-KERNEL=="%E{CRYPTOSD_NO}*", GOTO="cryptosd_end"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="??*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="???*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]?*", SUBSYSTEMS=="mmc", IMPORT{parent}="CRYPTOSD_IGNORE"
+ENV{CRYPTOSD_IGNORE}=="1", GOTO="cryptosd_end"
 
 # Set power control / UDISKS_CAN_POWER_OFF for all devices dealt with, here: This is also supported for partitions, not only disks!?!
 # KERNEL=="mmcblk[1-9]*", ATTR{power/control}=="off", ATTR{power/control}="auto"

From aa90fde2aa65b89bc3077bd73ecd2292797765bb Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Sun, 29 May 2022 05:58:45 +0200
Subject: [PATCH 3/5] Update 96-cryptosd.rules

---
 udev/rules.d/96-cryptosd.rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/udev/rules.d/96-cryptosd.rules b/udev/rules.d/96-cryptosd.rules
index 289361f..cbb2acf 100644
--- a/udev/rules.d/96-cryptosd.rules
+++ b/udev/rules.d/96-cryptosd.rules
@@ -20,9 +20,9 @@ KERNEL=="mmcblk[1-9]*", ENV{DEVTYPE}=="disk", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{DEVTYPE}=="disk", ATTR{queue/rotational}=="0", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
 # Do not try to handle (i.e., to auto-mount) internal eMMC (ToDo: in the future also UFS & NVMe) devices with either boot areas or RPMBs:
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="??*", ENV{CRYPTOSD_IGNORE}="1"
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="???*", ENV{CRYPTOSD_IGNORE}="1"
-KERNEL=="mmcblk[0-9]?*", SUBSYSTEMS=="mmc", IMPORT{parent}="CRYPTOSD_IGNORE"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="???*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="????*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]??*", SUBSYSTEMS=="mmc", IMPORT{parent}="CRYPTOSD_IGNORE"
 ENV{CRYPTOSD_IGNORE}=="1", GOTO="cryptosd_end"
 
 # Set power control / UDISKS_CAN_POWER_OFF for all devices dealt with, here: This is also supported for partitions, not only disks!?!

From 419fa29147d90eb21256b54cff17c37cb1529bae Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Sun, 29 May 2022 06:10:05 +0200
Subject: [PATCH 4/5] Update 96-cryptosd.rules

---
 udev/rules.d/96-cryptosd.rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/udev/rules.d/96-cryptosd.rules b/udev/rules.d/96-cryptosd.rules
index cbb2acf..d9a7f03 100644
--- a/udev/rules.d/96-cryptosd.rules
+++ b/udev/rules.d/96-cryptosd.rules
@@ -20,8 +20,8 @@ KERNEL=="mmcblk[1-9]*", ENV{DEVTYPE}=="disk", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{DEVTYPE}=="disk", ATTR{queue/rotational}=="0", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
 # Do not try to handle (i.e., to auto-mount) internal eMMC (ToDo: in the future also UFS & NVMe) devices with either boot areas or RPMBs:
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="???*", ENV{CRYPTOSD_IGNORE}="1"
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="????*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="?*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="??*", ENV{CRYPTOSD_IGNORE}="1"
 KERNEL=="mmcblk[0-9]??*", SUBSYSTEMS=="mmc", IMPORT{parent}="CRYPTOSD_IGNORE"
 ENV{CRYPTOSD_IGNORE}=="1", GOTO="cryptosd_end"
 

From b33fb5f79a4dde3a9bdd3b288a96df4578f8215b Mon Sep 17 00:00:00 2001
From: olf <Olf0@users.noreply.github.com>
Date: Sun, 13 Nov 2022 21:54:17 +0100
Subject: [PATCH 5/5] Update 96-cryptosd.rules

---
 udev/rules.d/96-cryptosd.rules | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/udev/rules.d/96-cryptosd.rules b/udev/rules.d/96-cryptosd.rules
index d9a7f03..b409430 100644
--- a/udev/rules.d/96-cryptosd.rules
+++ b/udev/rules.d/96-cryptosd.rules
@@ -20,9 +20,9 @@ KERNEL=="mmcblk[1-9]*", ENV{DEVTYPE}=="disk", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_
 SUBSYSTEMS=="usb", KERNEL=="mmcblk0*|sd*|sr*", ENV{DEVTYPE}=="disk", ATTR{queue/rotational}=="0", ENV{MMC_TYPE}!="?*", ENV{ID_DRIVE_FLASH_SD}="1", ENV{ID_DRIVE_MEDIA_FLASH_SD}="1"
 
 # Do not try to handle (i.e., to auto-mount) internal eMMC (ToDo: in the future also UFS & NVMe) devices with either boot areas or RPMBs:
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="?*", ENV{CRYPTOSD_IGNORE}="1"
-KERNEL=="mmcblk[0-9]", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="??*", ENV{CRYPTOSD_IGNORE}="1"
-KERNEL=="mmcblk[0-9]??*", SUBSYSTEMS=="mmc", IMPORT{parent}="CRYPTOSD_IGNORE"
+KERNEL=="mmcblk[0-9]*", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%kboot0/size}=="?*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]*", SUBSYSTEMS=="mmc", ENV{DEVTYPE}=="disk", ATTR{%krpmb/size}=="??*", ENV{CRYPTOSD_IGNORE}="1"
+KERNEL=="mmcblk[0-9]*", SUBSYSTEMS=="mmc", ENV{DEVTYPE}!="disk", IMPORT{parent}="CRYPTOSD_IGNORE"
 ENV{CRYPTOSD_IGNORE}=="1", GOTO="cryptosd_end"
 
 # Set power control / UDISKS_CAN_POWER_OFF for all devices dealt with, here: This is also supported for partitions, not only disks!?!