# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1225926818 28800
# Node ID 6f62d6165aa6f5b60156c2c56c2d72a12a021886
# Parent 16aa18cf5325f5e689c4967d35288d15825fc2be
Fix RASD provider unregistration.
Since <>_ResourceAllocationSettingData is listed first in the mof, it doesn't
get properly unregistered because <>_ProcResourceAllocationSettingData (etc)
hasn't been unregistered yet.
This patch forces the ResourceAllocationSettingData unregistration to be run
twice, which isn't ideal, but ensures the classes are properly cleaned up.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 16aa18cf5325 -r 6f62d6165aa6 Makefile.am
--- a/Makefile.am Wed Nov 05 15:09:49 2008 -0800
+++ b/Makefile.am Wed Nov 05 15:13:38 2008 -0800
@@ -112,6 +112,10 @@
schema/ElementConformsToProfile.registration \
schema/ReferencedProfile.registration
+# This definition is needed during provider unregistration
+RASD_MOF = schema/ResourceAllocationSettingData.mof
+RASD_REG = schema/ResourceAllocationSettingData.registration
+
pkgdata_DATA = $(MOFS) $(REGS) $(INTEROP_MOFS) $(INTEROP_REGS)
pkgdata_SCRIPTS = provider-register.sh
@@ -134,6 +138,7 @@
preuninstall:
sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(REGS) -m $(MOFS)
+ sh provider-register.sh -v -d -t @CIMSERVER@ -n @CIM_VIRT_NS@ -r $(RASD_REG) -m
$(RASD_MOF)
sh provider-register.sh -v -d -t @CIMSERVER@ -n root/interop -r $(INTEROP_REGS) -m
$(INTEROP_MOFS)
rpm: clean