udisks2: correct patch
This was forgotten during https://github.com/NixOS/nixpkgs/pull/147606
This commit is contained in:
parent
a41ccc8966
commit
39f7bd4d69
|
@ -25,9 +25,11 @@ stdenv.mkDerivation rec {
|
|||
blkid = "${util-linux}/bin/blkid";
|
||||
false = "${coreutils}/bin/false";
|
||||
mdadm = "${mdadm}/bin/mdadm";
|
||||
mkswap = "${util-linux}/bin/mkswap";
|
||||
sed = "${gnused}/bin/sed";
|
||||
sh = "${bash}/bin/sh";
|
||||
sleep = "${coreutils}/bin/sleep";
|
||||
swapon = "${util-linux}/bin/swapon";
|
||||
true = "${coreutils}/bin/true";
|
||||
})
|
||||
(substituteAll {
|
||||
|
|
|
@ -1,17 +1,5 @@
|
|||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 56922b79..697f8c6e 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,6 +1,6 @@
|
||||
## Process this file with automake to produce Makefile.in
|
||||
|
||||
-SHELL = @BASH@
|
||||
+SHELL = @bash@
|
||||
.SHELLFLAGS = -o pipefail -c
|
||||
|
||||
PYTHON ?= python3
|
||||
diff --git a/data/80-udisks2.rules b/data/80-udisks2.rules
|
||||
index 39bfa28b..ee1ca90a 100644
|
||||
index ca802cce..bfd1c29e 100644
|
||||
--- a/data/80-udisks2.rules
|
||||
+++ b/data/80-udisks2.rules
|
||||
@@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="?*", GOTO="udisks_probe_end"
|
||||
|
@ -66,9 +54,27 @@ index e7df4ed2..ab4356d9 100644
|
|||
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
#
|
||||
diff --git a/src/tests/integration-test b/src/tests/integration-test
|
||||
index 4499a6a9..8b711f95 100755
|
||||
index 07e4e029..3bd8ec51 100755
|
||||
--- a/src/tests/integration-test
|
||||
+++ b/src/tests/integration-test
|
||||
@@ -299,7 +299,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||
if not device:
|
||||
device = cls.devname(partition)
|
||||
result = {}
|
||||
- cmd = subprocess.Popen(['blkid', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||
+ cmd = subprocess.Popen(['@blkid@', '-p', '-o', 'udev', device], stdout=subprocess.PIPE)
|
||||
for l in cmd.stdout:
|
||||
(key, value) = l.decode('UTF-8').split('=', 1)
|
||||
result[key] = value.strip()
|
||||
@@ -437,7 +437,7 @@ class UDisksTestCase(unittest.TestCase):
|
||||
f.write('KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", '
|
||||
'ATTRS{model}=="scsi_debug*", '
|
||||
'ENV{ID_CDROM_MEDIA}=="?*", '
|
||||
- 'IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode"\n')
|
||||
+ 'IMPORT{program}="@blkid@ -o udev -p -u noraid $tempnode"\n')
|
||||
# reload udev
|
||||
subprocess.call('sync; pkill --signal HUP udevd || '
|
||||
'pkill --signal HUP systemd-udevd',
|
||||
@@ -1142,7 +1142,7 @@ class FS(UDisksTestCase):
|
||||
self.assertFalse(os.access(f, os.X_OK))
|
||||
|
||||
|
@ -150,6 +156,3 @@ index 3ddbdf2c..a87f960a 100644
|
|||
udisks_spawned_job_start (job);
|
||||
g_object_unref (job);
|
||||
}
|
||||
--
|
||||
2.33.1
|
||||
|
||||
|
|
Loading…
Reference in a new issue