diff options
| author | JKDingwall <[email protected]> | 2017-12-04 19:53:57 +0000 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-12-04 11:53:57 -0800 |
| commit | 9717fe052b6b7a43e497974817e392dffd8b939b (patch) | |
| tree | fbd42edc5d5089de0dbd3c4bc31f5a5adbec4f89 /contrib | |
| parent | ea39f75f64ff72e30900a36e00632f180f5f6676 (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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/initramfs/hooks/zfs.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/initramfs/hooks/zfs.in b/contrib/initramfs/hooks/zfs.in index ef3ccbc18..b34cad1e8 100755 --- a/contrib/initramfs/hooks/zfs.in +++ b/contrib/initramfs/hooks/zfs.in @@ -20,6 +20,7 @@ COPY_FILE_LIST="$COPY_FILE_LIST @udevruledir@/69-vdev.rules" # These prerequisites are provided by the base system. 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. |