]> granicus.if.org Git - zfs/commitdiff
Add /usr/bin/env to COPY_EXEC_LIST initramfs hook
authorJKDingwall <james@dingwall.me.uk>
Mon, 4 Dec 2017 19:53:57 +0000 (19:53 +0000)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 4 Dec 2017 19:53:57 +0000 (11:53 -0800)
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 <mail@gmelikov.ru>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: James Dingwall <james.dingwall@zynstra.com>
Closes #5360
Closes #6913

contrib/initramfs/hooks/zfs.in

index ef3ccbc18cad0212be1af501847ccbbdd09e5cab..b34cad1e8520348a271cd8e8ce9f70d9068570a4 100755 (executable)
@@ -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.