Add /usr/bin/env to COPY_EXEC_LIST initramfs hook

5dc1ff2 changed the user space program to mount a zfs snapshot from /bin/sh to /usr/bin/env. If the executable is not present in the initramfs then snapshots cannot be automounted. Signed-off-by: James Dingwall <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]>
tonyhutter · Dec 1, 2017 · 6e82ac9 · 6e82ac9
1 parent 632d7f1
commit 6e82ac9
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs
@@ -9,13 +9,14 @@ PREREQ="zdev"
 # These prerequisites are provided by the zfsutils package. The zdb utility is
 # not strictly required, but it can be useful at the initramfs recovery prompt.
 COPY_EXEC_LIST="/sbin/zdb /sbin/zpool /sbin/zfs /sbin/mount.zfs"
-COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/dirname /lib/udev/vdev_id"
+COPY_EXEC_LIST="$COPY_EXEC_LIST /lib/udev/vdev_id"
 COPY_FILE_LIST="/etc/hostid /etc/zfs/zpool.cache /etc/default/zfs"
 COPY_FILE_LIST="$COPY_FILE_LIST /etc/zfs/zfs-functions /etc/zfs/vdev_id.conf"
 COPY_FILE_LIST="$COPY_FILE_LIST /lib/udev/rules.d/69-vdev.rules"
 
 # These prerequisites are provided by the base system.
-COPY_EXEC_LIST="$COPY_EXEC_LIST /bin/hostname /sbin/blkid"
+COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/dirname /bin/hostname /sbin/blkid"
+COPY_EXEC_LIST="$COPY_EXEC_LIST /usr/bin/env"
 
 # Explicitly specify all kernel modules because automatic dependency resolution
 # is unreliable on many systems.