New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Honor --with-mounthelperdir where applicable #6962
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice catch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you perform a ./configure --help you will notice that there is a --with-mounthelperdir option. We should honor that.
|
Good catch @dinatale2, yes we should honor that. I'd forgotten it was added. |
|
@dinatale2 thanks, i had missed that. I'm kind of two minds about this: if i understand correctly Out of curiosity i just installed ZFS on a Gentoo box and the build system doesn't seem to be using |
|
@behlendorf i'll update the PR accordingly to honor |
65c79c8
to
8e90341
Compare
| @@ -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 | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you may need to add -e 's,@mounthelperdir\@,$(mounthelperdir),g' to the sed command in contrib/dracut/90zfs/Makefile.am.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dinatale2 you're right, thanks.
Signed-off-by: Giuseppe Di Natale <dinatale2@llnl.gov> Signed-off-by: loli10K <ezomori.nozomu@gmail.com>
8e90341
to
b9927ec
Compare
Codecov Report
@@ Coverage Diff @@
## master #6962 +/- ##
==========================================
+ Coverage 75.17% 75.19% +0.01%
==========================================
Files 296 296
Lines 95453 95453
==========================================
+ Hits 71759 71772 +13
+ Misses 23694 23681 -13
Continue to review full report at Codecov.
|
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 openzfs#6962
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 openzfs#6962
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 openzfs#6962 (cherry picked from commit e2d936e)
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 openzfs#6962 (cherry picked from commit e2d936e) Signed-off-by: Neal Gompa <ngompa@datto.com> Requires-spl: spl-0.7-release
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 openzfs#6962
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
Description
Tiny fix:
mount.zfsis always installed in "/sbin", if ZFS is ./configure'd with a custom (or the default "/usr/local") prefix dracut can't find the mount helper binary.Motivation and Context
Custom ZFS builds may fail to mount filesystems.
How Has This Been Tested?
Types of changes
Checklist:
Signed-off-by.