Skip to content

Commit

Permalink
Add /usr/bin/env to COPY_EXEC_LIST initramfs hook
Browse files Browse the repository at this point in the history
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.

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 openzfs#5360 
Closes openzfs#6913
  • Loading branch information
JKDingwall authored and FransUrbo committed Apr 28, 2019
1 parent d771d59 commit 3f9f730
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions contrib/initramfs/hooks/zfs.in
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 3f9f730

Please sign in to comment.