From d45702bcfa1cdc0ef22534f38c98b44cfa0734ec Mon Sep 17 00:00:00 2001 From: JKDingwall Date: Mon, 4 Dec 2017 19:53:57 +0000 Subject: [PATCH] Add /usr/bin/env to COPY_EXEC_LIST initramfs hook 5dc1ff29 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. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Reviewed-by: Richard Laager Reviewed-by: Giuseppe Di Natale Signed-off-by: James Dingwall Closes #5360 Closes #6913 Conflicts: contrib/initramfs/hooks/zfs --- contrib/initramfs/hooks/zfs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/initramfs/hooks/zfs b/contrib/initramfs/hooks/zfs index 26aaa6e18..31db67c25 100755 --- a/contrib/initramfs/hooks/zfs +++ b/contrib/initramfs/hooks/zfs @@ -15,7 +15,8 @@ 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.