diff options
author | Tomas Smetana <tsmetana@redhat.com> | 2013-11-12 15:35:30 +0100 |
---|---|---|
committer | Tomas Smetana <tsmetana@redhat.com> | 2013-11-12 15:35:30 +0100 |
commit | aa0ce80be89faa1fd3e4cb51b1b4f0b9edb8d94f (patch) | |
tree | bd5e516614bbb9f22e537d9e82d210c70ffe493d /src/pcp | |
parent | eae4cca7eb126191b38fe138c1419f190d030000 (diff) | |
download | openlmi-providers-aa0ce80be89faa1fd3e4cb51b1b4f0b9edb8d94f.tar.gz openlmi-providers-aa0ce80be89faa1fd3e4cb51b1b4f0b9edb8d94f.tar.xz openlmi-providers-aa0ce80be89faa1fd3e4cb51b1b4f0b9edb8d94f.zip |
PCP: fix failed post-install registration
Diffstat (limited to 'src/pcp')
-rw-r--r-- | src/pcp/openlmi-pcp-generate.in (renamed from src/pcp/openlmi-pcp-generate) | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/pcp/openlmi-pcp-generate b/src/pcp/openlmi-pcp-generate.in index a99fd67..088242e 100644 --- a/src/pcp/openlmi-pcp-generate +++ b/src/pcp/openlmi-pcp-generate.in @@ -43,6 +43,7 @@ STAMPFILE=$MOFREGDIR/stamp MOFFILE=$MOFREGDIR/60_LMI_PCP_PMNS.mof REGFILE=$MOFREGDIR/60_LMI_PCP_PMNS.reg PROVIDER=$PYTHON2_SITELIB/lmi/pcp/metric.py +VERSION=@OPENLMI_VERSION@ if [ ! -f $PROVIDER ]; then echo "Cannot find $PROVIDER" 1>&2 @@ -61,7 +62,7 @@ if [ -s $PCP_PMNS -a $PCP_PMNS -nt $STAMPFILE ]; then echo Unregistering $BASEMOFFILE echo Unregistering previous $MOFFILE echo Unregistering previous $REGFILE - openlmi-mof-register unregister $BASEMOFFILE $MOFFILE $REGFILE || : + openlmi-mof-register unregister -v $VERSION $BASEMOFFILE $MOFFILE $REGFILE || : fi echo Generating $MOFFILE @@ -81,7 +82,7 @@ if [ -s $PCP_PMNS -a $PCP_PMNS -nt $STAMPFILE ]; then echo Registering $BASEMOFFILE echo Registering new $MOFFILE echo Registering new $REGFILE - openlmi-mof-register register $BASEMOFFILE $MOFFILE $REGFILE 2>&1 | # filter out two noise diagnostics + openlmi-mof-register register -v $VERSION $BASEMOFFILE $MOFFILE $REGFILE 2>&1 | # filter out two noise diagnostics egrep -v 'Warning: the instance already exists.|In this implementation, that means it cannot be changed.' || : touch $STAMPFILE else |