RPM: Fix regex so old versions of DKMS modules are removed on upgrade #10327
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
Due to a mismatch between the text and a regex looking for that text, the `%preuninstall` script would never run the `dkms remove` command necessary to avoid corrupting the DKMS data configuration. Increase regex specificity to avoid this issue. Closes: openzfs#9891 Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com>
ColMelvin
force-pushed
the
fix.module-removal-on-upgrade
branch
from
4a77718 to
5df480a
Compare
|
When testing this change, for whatever reason, zfs-import-cache.service fails consistently when I boot; however, Unfortunately, I can't verify that assertion because, without this fix, updating zfs-dkms to 0.8.4 will not create a zfs module - and I cannot manually create one with |
Codecov Report
@@ Coverage Diff @@
## master #10327 +/- ##
==========================================
+ Coverage 79.24% 79.28% +0.03%
==========================================
Files 390 390
Lines 123336 123336
==========================================
+ Hits 97737 97784 +47
+ Misses 25599 25552 -47
Continue to review full report at Codecov.
|
behlendorf
added
Component: Packaging
tonyhutter
approved these changes
May 14, 2020
behlendorf
approved these changes
May 15, 2020
behlendorf
added
Status: Accepted
as-com
pushed a commit
to as-com/zfs
that referenced
this pull request
Jun 20, 2020
Due to a mismatch between the text and a regex looking for that text, the `%preuninstall` script would never run the `dkms remove` command necessary to avoid corrupting the DKMS data configuration. Increase regex specificity to avoid this issue. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com> Closes: openzfs#9891 Closes openzfs#10327 (cherry picked from commit 4d6043f)
tonyhutter
added a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 15, 2020
Due to a mismatch between the text and a regex looking for that text, the `%preuninstall` script would never run the `dkms remove` command necessary to avoid corrupting the DKMS data configuration. Increase regex specificity to avoid this issue. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com> Closes: openzfs#9891 Closes openzfs#10327
tonyhutter
pushed a commit
to tonyhutter/zfs
that referenced
this pull request
Sep 15, 2020
Due to a mismatch between the text and a regex looking for that text, the `%preuninstall` script would never run the `dkms remove` command necessary to avoid corrupting the DKMS data configuration. Increase regex specificity to avoid this issue. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com> Closes: openzfs#9891 Closes openzfs#10327
jsai20
pushed a commit
to jsai20/zfs
that referenced
this pull request
Mar 30, 2021
Due to a mismatch between the text and a regex looking for that text, the `%preuninstall` script would never run the `dkms remove` command necessary to avoid corrupting the DKMS data configuration. Increase regex specificity to avoid this issue. Reviewed-by: Tony Hutter <hutter2@llnl.gov> Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Chris Lindee <chris.lindee+github@gmail.com> Closes: openzfs#9891 Closes openzfs#10327
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.
Due to a mismatch between the text and a regex looking for that text,
the
%preuninstallscript would never run thedkms removecommandnecessary to avoid corrupting the DKMS data configuration. Increase
regex specificity to avoid this issue.
Closes: #9891
Motivation and Context
Solves #9891
Description
Adds more specificity to regex, to ensure it matches against a line that has a double quote (
"). This keepsawkfrom printing no output.How Has This Been Tested?
dnf update -y -x zfs\* -x kernel\*.rpm --reinstall --noscripts ./zfs-dkms-0.8.3-1.fc31.noarch.rpmto install the new%preuninstallscriptdkms statusto verify DKMS tool still worksdnf update -y zfs-dkmsto install v0.8.4dkms statusand verified DKMS tool still worked, with no mention of zfs 0.8.3, but with an install of zfs 0.8.4 availablesystemctl restart zfs-import-cachednf update -yto upgrade zfs-dkms to v0.8.4 and the kernel to 5.6.11dkms statusand verified DKMS tool still worked, with no mention of zfs 0.8.3, but with an install of zfs 0.8.4 available (for both 5.4.20 and 5.6.11)systemctl restart zfs-import-cacheTypes of changes
Checklist:
Signed-off-by.