Fix zfs-functions packaging bug #9959
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
full configure line the other patch from PR #9955 does not apply cleanly, I'll rebase and test it now. |
|
nvm comment above, I just had to delete those files before build to get proper files generated. |
This fixes a bug where the generated zfs-functions was being included along with original zfs-functions.in in the make dist tarball. This caused an unfortunate series of events during build/packaging that resulted in the RPM-installed /etc/zfs/zfs-functions listing the paths as: ZFS="/usr/local/sbin/zfs" ZED="/usr/local/sbin/zed" ZPOOL="/usr/local/sbin/zpool" When they should have been: ZFS="/sbin/zfs" ZED="/sbin/zed" ZPOOL="/sbin/zpool" This affects init.d (non-systemd) distros like CentOS 6. Fixes: openzfs#9443 Signed-off-by: Tony Hutter <hutter2@llnl.gov>
tonyhutter
force-pushed
the
zfs-functions
branch
from
00478e1
to
2cc089a
Compare
rlaager
suggested changes
Feb 8, 2020
rlaager
reviewed
Feb 8, 2020
| $(top_srcdir)/contrib/initramfs/conf.d/zfs \ | ||
| $(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \ | ||
| $(top_srcdir)/contrib/initramfs/README.initramfs.markdown | ||
|
|
||
| $(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions: | ||
| $(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions | ||
|
|
There was a problem hiding this comment.
You should probably remove one of these blank lines.
|
I rebased #9955 on this change, with the changes from my review comments addressed. If you are happy with those changes, we have a few options:
I'm guessing we would go with option 3. |
Codecov Report
@@ Coverage Diff @@
## master #9959 +/- ##
==========================================
+ Coverage 79.23% 79.32% +0.09%
==========================================
Files 385 385
Lines 121938 121938
==========================================
+ Hits 96612 96723 +111
+ Misses 25326 25215 -111
Continue to review full report at Codecov.
|
|
Closing in favor of #9955 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation and Context
Fixes: #9443
Description
This fixes a bug where the generated
zfs-functionswas being included along with originalzfs-functions.inin the make dist tarball. This caused an unfortunate series of events during build/packaging that resulted in the RPM-installed/etc/zfs/zfs-functionslisting the paths as:When they should have been:
This affects init.d (non-systemd) distros like CentOS 6.
How Has This Been Tested?
Manually tested on Centos 6 against the
zfs-0.8-releasebranch, sincemasterno longer supports Centos 6. Verified that /etc/zfs/zfs-functions in the zfs rpm had the right paths.Types of changes
Checklist:
Signed-off-by.