diff options
| author | JKDingwall <[email protected]> | 2017-12-04 19:53:57 +0000 |
|---|---|---|
| committer | Tony Hutter <[email protected]> | 2017-12-04 17:22:36 -0800 |
| commit | d45702bcfa1cdc0ef22534f38c98b44cfa0734ec (patch) | |
| tree | e559c989f5fc99a149bb97a6db32a31a6627d468 /contrib/initramfs/hooks | |
| parent | ddd20dbe0bc3121247be66e4be5ea6b91253f485 (diff) | |
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 <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Richard Laager <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: James Dingwall <[email protected]>
Closes #5360
Closes #6913
Conflicts:
contrib/initramfs/hooks/zfs
Diffstat (limited to 'contrib/initramfs/hooks')
| -rwxr-xr-x | contrib/initramfs/hooks/zfs | 3 |
1 files changed, 2 insertions, 1 deletions
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. |