pyrox.dev
udisks2: correct patch
This was forgotten during https://github.com/NixOS/nixpkgs/pull/147606
+2
pkgs/os-specific/linux/udisks/2-default.nix
+2
pkgs/os-specific/linux/udisks/2-default.nix
···
25
blkid = "${util-linux}/bin/blkid";
26
false = "${coreutils}/bin/false";
27
mdadm = "${mdadm}/bin/mdadm";
28
+
mkswap = "${util-linux}/bin/mkswap";
29
sed = "${gnused}/bin/sed";
30
sh = "${bash}/bin/sh";
31
sleep = "${coreutils}/bin/sleep";
32
+
swapon = "${util-linux}/bin/swapon";
33
true = "${coreutils}/bin/true";
34
})
35
(substituteAll {
+20
-17
pkgs/os-specific/linux/udisks/fix-paths.patch
+20
-17
pkgs/os-specific/linux/udisks/fix-paths.patch
···
1
-
diff --git a/Makefile.am b/Makefile.am
2
-
index 56922b79..697f8c6e 100644
3
-
--- a/Makefile.am
4
-
+++ b/Makefile.am
5
-
@@ -1,6 +1,6 @@
6
-
## Process this file with automake to produce Makefile.in
7
-
8
-
-SHELL = @BASH@
9
-
+SHELL = @bash@
10
-
.SHELLFLAGS = -o pipefail -c
11
-
12
-
PYTHON ?= python3
13
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
14
-
index 39bfa28b..ee1ca90a 100644
15
--- a/data/80-udisks2.rules
16
+++ b/data/80-udisks2.rules
17
@@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
···
66
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
67
#
68
diff --git a/src/tests/integration-test b/src/tests/integration-test
69
-
index 4499a6a9..8b711f95 100755
70
--- a/src/tests/integration-test
71
+++ b/src/tests/integration-test
72
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
73
self.assertFalse(os.access(f, os.X_OK))
74
···
150
udisks_spawned_job_start (job);
151
g_object_unref (job);
152
}
153
-
--
154
-
2.33.1
155
-
···
1
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
2
+
index ca802cce..bfd1c29e 100644
3
--- a/data/80-udisks2.rules
4
+++ b/data/80-udisks2.rules
5
@@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
···
54
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
55
#
56
diff --git a/src/tests/integration-test b/src/tests/integration-test
57
+
index 07e4e029..3bd8ec51 100755
58
--- a/src/tests/integration-test
59
+++ b/src/tests/integration-test
60
+
@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase):
61
+
if not device:
62
+
device = cls.devname(partition)
63
+
result = {}
64
+
- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
65
+
+ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
66
+
for l in cmd.stdout:
67
+
(key, value) = l.decode('UTF-8').split('=', 1)
68
+
result[key] = value.strip()
69
+
@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase):
70
+
f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '
71
+
'ATTRS{model}=="scsi_debug*", '
72
+
'ENV{ID_CDROM_MEDIA}=="?*", '
73
+
- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')
74
+
+ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')
75
+
# reload udev
76
+
subprocess.call('sync; pkill --signal HUP udevd || '
77
+
'pkill --signal HUP systemd-udevd',
78
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
79
self.assertFalse(os.access(f, os.X_OK))
80
···
156
udisks_spawned_job_start (job);
157
g_object_unref (job);
158
}