diff options
| author | Peter Schiffer <pschiffe@redhat.com> | 2013-06-27 16:52:58 +0200 |
|---|---|---|
| committer | Peter Schiffer <pschiffe@redhat.com> | 2013-06-27 16:52:58 +0200 |
| commit | 6fab15ca48be60d128ae68c051bd93b346ff1ab6 (patch) | |
| tree | 168ef3db0818ccb5ce6fb8cba72afa4ef68baf50 /src | |
| parent | c6d97a2d474ba80e6c7449f5127635f8f5663830 (diff) | |
| parent | f871bc280bf833aa9bd7ca39c94817ee4ff03ff2 (diff) | |
| download | openlmi-providers-6fab15ca48be60d128ae68c051bd93b346ff1ab6.tar.gz openlmi-providers-6fab15ca48be60d128ae68c051bd93b346ff1ab6.tar.xz openlmi-providers-6fab15ca48be60d128ae68c051bd93b346ff1ab6.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/openlmi-providers
Diffstat (limited to 'src')
| -rw-r--r-- | src/logicalfile/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/logicalfile/LMI_UnixDirectoryProvider.c | 2 | ||||
| -rwxr-xr-x | src/logicalfile/cmpiLMI_LogicalFile-cimprovagt | 21 |
3 files changed, 24 insertions, 1 deletions
diff --git a/src/logicalfile/CMakeLists.txt b/src/logicalfile/CMakeLists.txt index 3a80353..7f3c05d 100644 --- a/src/logicalfile/CMakeLists.txt +++ b/src/logicalfile/CMakeLists.txt @@ -2,6 +2,7 @@ set(PROVIDER_NAME LogicalFile) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) set(MOF 60_LMI_LogicalFile.mof) +set(CIMPROVAGT_SCRIPT cmpiLMI_${PROVIDER_NAME}-cimprovagt) set(provider_SRCS file.c @@ -27,3 +28,4 @@ target_link_libraries(${LIBRARY_NAME} openlmicommon ${KONKRETCMPI_LIBRARIES} ${L cim_registration(${PROVIDER_NAME} ${LIBRARY_NAME} ${MOF} share/openlmi-providers) install(TARGETS ${LIBRARY_NAME} DESTINATION lib${LIB_SUFFIX}/cmpi) +install(PROGRAMS ${CIMPROVAGT_SCRIPT} DESTINATION libexec/pegasus) diff --git a/src/logicalfile/LMI_UnixDirectoryProvider.c b/src/logicalfile/LMI_UnixDirectoryProvider.c index 6483c43..2628982 100644 --- a/src/logicalfile/LMI_UnixDirectoryProvider.c +++ b/src/logicalfile/LMI_UnixDirectoryProvider.c @@ -113,7 +113,7 @@ static CMPIStatus LMI_UnixDirectoryDeleteInstance( if (rmdir(path) < 0) { char errmsg[BUFLEN]; - snprintf(errmsg, BUFLEN, "Can't mkdir: %s (%s)", path, strerror(errno)); + snprintf(errmsg, BUFLEN, "Can't rmdir: %s (%s)", path, strerror(errno)); CMReturnWithChars(_cb, CMPI_RC_ERR_FAILED, errmsg); } diff --git a/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt new file mode 100755 index 0000000..f6c8842 --- /dev/null +++ b/src/logicalfile/cmpiLMI_LogicalFile-cimprovagt @@ -0,0 +1,21 @@ +#!/bin/sh +# +# Copyright (C) 2013 Red Hat, Inc. All rights reserved. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Authors: Jan Synacek <jsynacek@redhat.com> + +/usr/libexec/pegasus/cimprovagt "$@" |