tjh.dev
1diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
2index 7c517b87b..e51a33778 100644
3--- a/scripts/blkdeactivate.sh.in
4+++ b/scripts/blkdeactivate.sh.in
5@@ -34,11 +34,11 @@ TOOL=blkdeactivate
6 DEV_DIR="/dev"
7 SYS_BLK_DIR="/sys/block"
8
9-MDADM="/sbin/mdadm"
10-MOUNTPOINT="/bin/mountpoint"
11-MPATHD="/sbin/multipathd"
12-UMOUNT="/bin/umount"
13-VDO="/bin/vdo"
14+MDADM="@mdadm@/bin/mdadm"
15+MOUNTPOINT="@util_linux@/bin/mountpoint"
16+MPATHD="@multipath_tools@/bin/multipathd"
17+UMOUNT="@util_linux@/bin/umount"
18+VDO="@vdo@/bin/vdo"
19
20 sbindir="@SBINDIR@"
21 DMSETUP="$sbindir/dmsetup"
22@@ -48,7 +48,7 @@ if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
23 UMOUNT_OPTS="--all-targets "
24 else
25 UMOUNT_OPTS=""
26- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
27+ FINDMNT="@util_linux@/bin/findmnt -r --noheadings -u -o TARGET"
28 FINDMNT_READ="read -r mnt"
29 fi
30 DMSETUP_OPTS=""
31@@ -57,10 +57,10 @@ MDADM_OPTS=""
32 MPATHD_OPTS=""
33 VDO_OPTS=""
34
35-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
36+LSBLK="@util_linux@/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
37 LSBLK_VARS="local devtype local kname local name local mnt"
38 LSBLK_READ="read -r devtype kname name mnt"
39-SORT_MNT="/bin/sort -r -u -k 4"
40+SORT_MNT="@coreutils@/bin/sort -r -u -k 4"
41
42 # Do not show tool errors by default (only done/skipping summary
43 # message provided by this script) and no verbose mode by default.
44@@ -102,6 +102,7 @@ declare -A SKIP_VG_LIST=()
45 # (list is an associative array!)
46 #
47 declare -A SKIP_UMOUNT_LIST=(["/"]=1 \
48+ ["/nix"]=1 ["/nix/store"]=1 \
49 ["/lib"]=1 ["/lib64"]=1 \
50 ["/bin"]=1 ["/sbin"]=1 \
51 ["/var"]=1 ["/var/log"]=1 \