c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 02:27:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Honor --with-mounthelperdir where applicable

Browse Source 
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov>
Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
Closes #6962
This commit is contained in:
LOLi
2017-12-17 23:14:07 +01:00
committed by Brian Behlendorf
parent ee410eefc2
commit e2d936e0f8
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/initramfs/hooks/Makefile.am
+1
View File
@@ -11,6 +11,7 @@ $(hooks_SCRIPTS):%:%.in
-e 's,@sysconfdir\@,$(sysconfdir),g' \
-e 's,@udevdir\@,$(udevdir),g' \
-e 's,@udevruledir\@,$(udevruledir),g' \
-e 's,@mounthelperdir\@,$(mounthelperdir),g' \
$< >'$@'
clean-local::
contrib/initramfs/hooks/zfs.in
+2 -4
View File
@@ -8,10 +8,8 @@ PREREQ="zdev"
# These prerequisites are provided by the zfsutils package. The zdb utility is
# not strictly required, but it can be useful at the initramfs recovery prompt.
# The mount helper mount.zfs must be installed in /sbin because this path is
# hardcoded in the mount(8) for security reasons.
COPY_EXEC_LIST="@sbindir@/zdb @sbindir@/zpool @sbindir@/zfs /sbin/mount.zfs"
COPY_EXEC_LIST="$COPY_EXEC_LIST @udevdir@/vdev_id"
COPY_EXEC_LIST="@sbindir@/zdb @sbindir@/zpool @sbindir@/zfs"
COPY_EXEC_LIST="$COPY_EXEC_LIST @mounthelperdir@/mount.zfs @udevdir@/vdev_id"
COPY_FILE_LIST="/etc/hostid @sysconfdir@/zfs/zpool.cache"
COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/default/zfs"
COPY_FILE_LIST="$COPY_FILE_LIST @sysconfdir@/zfs/zfs-functions"