diff options
| author | LOLi <[email protected]> | 2017-12-17 23:14:07 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-12-17 14:14:07 -0800 |
| commit | e2d936e0f893084384a0d29ddf2edfd9f68deaf2 (patch) | |
| tree | 920a5959b5fffbb4add40a3fc4ce4354c4a6ac4e /contrib/dracut | |
| parent | ee410eefc2a9c0f0e77bd765894ee7767af647ea (diff) | |
Honor --with-mounthelperdir where applicable
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Giuseppe Di Natale <[email protected]>
Signed-off-by: loli10K <[email protected]>
Closes #6962
Diffstat (limited to 'contrib/dracut')
| -rw-r--r-- | contrib/dracut/90zfs/Makefile.am | 1 | ||||
| -rwxr-xr-x | contrib/dracut/90zfs/module-setup.sh.in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/contrib/dracut/90zfs/Makefile.am b/contrib/dracut/90zfs/Makefile.am index 243a5200f..a8f08bed7 100644 --- a/contrib/dracut/90zfs/Makefile.am +++ b/contrib/dracut/90zfs/Makefile.am @@ -24,6 +24,7 @@ $(pkgdracut_SCRIPTS):%:%.in -e 's,@udevruledir\@,$(udevruledir),g' \ -e 's,@sysconfdir\@,$(sysconfdir),g' \ -e 's,@systemdunitdir\@,$(systemdunitdir),g' \ + -e 's,@mounthelperdir\@,$(mounthelperdir),g' \ $< >'$@' distclean-local:: diff --git a/contrib/dracut/90zfs/module-setup.sh.in b/contrib/dracut/90zfs/module-setup.sh.in index 0f85c2a25..1d41c265f 100755 --- a/contrib/dracut/90zfs/module-setup.sh.in +++ b/contrib/dracut/90zfs/module-setup.sh.in @@ -5,7 +5,7 @@ check() { [ "${1}" = "-d" ] && return 0 # Verify the zfs tool chain - for tool in "@sbindir@/zpool" "@sbindir@/zfs" "@sbindir@/mount.zfs" ; do + for tool in "@sbindir@/zpool" "@sbindir@/zfs" "@mounthelperdir@/mount.zfs" ; do test -x "$tool" || return 1 done # Verify grep exists @@ -54,7 +54,7 @@ install() { # Fallback: Guess the path and include all matches dracut_install /usr/lib/gcc/*/*/libgcc_s.so* fi - dracut_install @sbindir@/mount.zfs + dracut_install @mounthelperdir@/mount.zfs dracut_install @udevdir@/vdev_id dracut_install awk dracut_install head |