From 344131a6142cc3b52d8eec10f07ac21aefd4d5a0 Mon Sep 17 00:00:00 2001 From: Vitezslav Crhonek Date: Thu, 17 Apr 2014 10:47:10 +0200 Subject: Service-legacy (non d-bus): - Add support for building service-legacy provider into cmake files (OFF by default) - Add service-legacy mof file (no indications, builds with older cmake) - Fix service enumeration (use chkconfig) --- src/service/CMakeLists.txt | 2 +- src/service/util/servicedisc.sh | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/service') diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 11ac5c8..6d75d38 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -1,7 +1,7 @@ set(PROVIDER_NAME Service) set(LIBRARY_NAME cmpiLMI_${PROVIDER_NAME}) -set(MOF 60_LMI_Service.mof) +set(MOF 60_LMI_Service-legacy.mof) set(CIMPROVAGT_SCRIPT cmpiLMI_${PROVIDER_NAME}-cimprovagt) set(provider_SRCS diff --git a/src/service/util/servicedisc.sh b/src/service/util/servicedisc.sh index f059200..f0964fa 100755 --- a/src/service/util/servicedisc.sh +++ b/src/service/util/servicedisc.sh @@ -37,10 +37,7 @@ then exit 0 elif [ -d $SYSV_SDIR ]; then - for i in $SYSV_SDIR/*; - do - echo ${i#$SYSV_SDIR/} - done + chkconfig --list | awk '{print $1}' exit 0 fi -- cgit