diff options
| author | Brian Behlendorf <[email protected]> | 2015-09-30 20:36:18 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2015-10-02 11:19:25 -0700 |
| commit | 3ef005c674e3207e8c6fba5d65a76468f97084ae (patch) | |
| tree | 18149a2cd426c3b80c431735430c6ce7c01ed1f9 | |
| parent | 919efe93cb1263a3cfa1b8edf4b0a636a9e579cd (diff) | |
Fix zfs-dkms uninstall/update
Modern versions of dkms cleanup the build directory after installing.
This resulted in 'dkms uninstall' never running because the check
added by commit 866c162 which verifies the existance of the
zfs.release build product would never be true.
This patch resolves the issue by updating the conditional to check
in the explicitly installed zfs_config.h file for the version.
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #3862
| -rw-r--r-- | rpm/generic/zfs-dkms.spec.in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/rpm/generic/zfs-dkms.spec.in b/rpm/generic/zfs-dkms.spec.in index a3388225c..e432bc414 100644 --- a/rpm/generic/zfs-dkms.spec.in +++ b/rpm/generic/zfs-dkms.spec.in @@ -62,12 +62,13 @@ echo -e "support or upgrade DKMS to a more current version." exit 1 %preun -# Only remove the modules if they are for this %{version}-%{release}. A -# package upgrade can replace them if only the %{release} is changed. -RELEASE="/var/lib/dkms/%{module}/%{version}/build/%{module}.release" -if [ -f $RELEASE ] && [ `cat $RELEASE`%{?dist} = "%{version}-%{release}" ]; then +CONFIG_H="/var/lib/dkms/%{module}/%{version}/*/*/%{module}_config.h" +SPEC_META_ALIAS="@PACKAGE@-@VERSION@-@RELEASE@" +DKMS_META_ALIAS=`cat $CONFIG_H 2>/dev/null | + awk -F'"' '/META_ALIAS/ { print $2; exit 0 }'` +if [ "$SPEC_META_ALIAS" = "$DKMS_META_ALIAS" ]; then echo -e - echo -e "Uninstall of %{module} module (version %{version}) beginning:" + echo -e "Uninstall of %{module} module ($SPEC_META_ALIAS) beginning:" dkms remove -m %{module} -v %{version} --all --rpm_safe_upgrade fi exit 0 |