summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsegfault <segfault@riseup.net>2019-08-01 11:38:10 +0200
committersegfault <segfault@riseup.net>2019-08-01 11:38:10 +0200
commitb12372ff6851880cfa0770024827495bdb6ce716 (patch)
treed4f1c917741a56dc45be90f578528070ab8b18aa
parent713f178ca0da22d6462c625f0a1a171e48c3ce8a (diff)
Use /lib/bilibop/test instead of is-unlocked-tails-data-from-boot-device (refs: #16789)bugfix/16789-unable-to-access-persistence
-rw-r--r--config/chroot_local-includes/etc/udev/rules.d/99-hide-TailsData.rules2
-rwxr-xr-xconfig/chroot_local-includes/usr/local/lib/is-unlocked-tails-data-from-boot-device12
2 files changed, 1 insertions, 13 deletions
diff --git a/config/chroot_local-includes/etc/udev/rules.d/99-hide-TailsData.rules b/config/chroot_local-includes/etc/udev/rules.d/99-hide-TailsData.rules
index 44f51a0..e7cf90e 100644
--- a/config/chroot_local-includes/etc/udev/rules.d/99-hide-TailsData.rules
+++ b/config/chroot_local-includes/etc/udev/rules.d/99-hide-TailsData.rules
@@ -1,4 +1,4 @@
# We set UDISKS_IGNORE on the TailsData partition of the live boot
# device to hide it in GNOME apps. This prevents spurious notifications
# being shown when setting up persistence.
-ENV{ID_FS_LABEL}=="TailsData", PROGRAM="/usr/local/lib/is-unlocked-tails-data-from-boot-device %k %p", ENV{UDISKS_IGNORE}="1"
+ENV{ID_FS_LABEL}=="TailsData", PROGRAM="/lib/bilibop/test $devnode", ENV{UDISKS_IGNORE}="1"
diff --git a/config/chroot_local-includes/usr/local/lib/is-unlocked-tails-data-from-boot-device b/config/chroot_local-includes/usr/local/lib/is-unlocked-tails-data-from-boot-device
deleted file mode 100755
index b3ca648..0000000
--- a/config/chroot_local-includes/usr/local/lib/is-unlocked-tails-data-from-boot-device
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-set -e
-set -u
-
-device="$1"
-sysfs_path="/sys/$2"
-
-[ -b "/dev/$device" ] || exit 3
-
-backing_device=$(ls "$sysfs_path/slaves/" | head -n1)
-lsblk -n -o kname /dev/bilibop | grep -q "^$backing_device$"