BUG#: 8661

PEP#: 350
TITLE: Multi CIMOM Suport on Same OS

diff --git a/Makefile.Release b/Makefile.Release
index 797e3c37308350cbd26da1f3378e5c911233c979..6da4e379e140044d21a785320884eeaca8f90d3e 100644 (file)
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -291,6 +291,8 @@ setpermissions_PegasusProductDirectories: FORCE
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_DIR)
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_LIB_DIR)
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Pr_xr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_PROVIDER_MANAGER_LIB_DIR)
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_BIN_DIR)
 
 stage_PegasusSocketDirectory: FORCE
        $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)
@@ -457,27 +459,28 @@ stage_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION
        $(MKDIRHIER) $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)
-       $(COPY) $(ROOT)/rpm/wbem $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem
+       $(COPY) $(ROOT)/rpm/wbem $(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)
        $(COPY) $(ROOT)/rpm/access.conf $(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif
        $(MKDIRHIER) $(PEGASUS_STAGING_DIR)/etc/init.d
-       $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "PEGASUS_SSL_CONF_FILE=$(PEGASUS_PEM_DIR)/ssl.cnf" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
-       $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/tog-pegasus
+       $(COPY) $(ROOT)/rpm/preamble-tog-pegasus.rc $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "CIMSERVER_BIN=$(PEGASUS_SBIN_DIR)/cimserver" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_SCRIPT_DIR=$(PEGASUS_SCRIPT_DIR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_SSL_CONF_FILE=$(PEGASUS_PEM_DIR)/ssl.cnf" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_SSL_CERT_FILE=$(PEGASUS_SSL_CERT_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_SSL_KEY_FILE=$(PEGASUS_SSL_KEY_FILE_PATH)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_SSL_TRUSTSTORE=$(PEGASUS_SSL_CLIENT_TRUSTSTORE)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       @$(ECHO-E) "PEGASUS_FLAVOR=$(PEGASUS_FLAVOR)" >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
+       $(CAT) $(ROOT)/rpm/commands-tog-pegasus.rc >> $(PEGASUS_STAGING_DIR)/etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif
 
 setpermissions_PegasusSystemFiles: FORCE
 ifeq ($(OS),linux)
 ifdef PEGASUS_PAM_AUTHENTICATION
-       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/wbem
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_r__r__)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)
        $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prw_______)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)$(PEGASUS_CONFIG_DIR)/access.conf
 endif
-       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/tog-pegasus
+       $(MAKE) --directory=$(ROOT) -f Makefile.Release setpermissions PERMISSIONS="$(Prwxr_xr_x)" OWNER="$(INSTALL_USR)" GROUP="$(INSTALL_GRP)" OBJECT=$(PEGASUS_STAGING_DIR)etc/init.d/$(PEGASUS_FLAVOR)-pegasus
 endif
 
 stage_PegasusEmptyFiles: FORCE
@@ -702,7 +705,7 @@ create_ProductInstallationVerificationScript: FORCE
              >> $(PEGASUS_HOME)/PegasusVerifyInstall
        @$(ECHO-E) "ls -ld $(PAM_CONFIG_DIR)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall
-       @$(ECHO-E) "ls -l $(PAM_CONFIG_DIR)/wbem" \
+       @$(ECHO-E) "ls -l $(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall
        @$(ECHO-E) "$(ECHO-E) \"\nPEGASUS TRACE FILES\"" \
              >> $(PEGASUS_HOME)/PegasusVerifyInstall
@@ -754,6 +757,8 @@ _append_OpenPegasusLicenseToSpecFile: FORCE
        @$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
 
 _append_PreambleToSpecFile: FORCE
+       @$(ECHO-E) "%define Flavor  $(PEGASUS_FLAVOR)" \
+            >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%define packageVersion $(PEGASUS_PACKAGE_VERSION)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "Version: $(PEGASUS_PRODUCT_VERSION)" \
@@ -899,7 +904,7 @@ ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "    /usr/sbin/groupadd $(CIMSERVERMAIN_GRP) > /dev/null" \
             "2>&1 || :;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "    /usr/sbin/useradd -c \"tog-pegasus OpenPegasus"\
+       @$(ECHO-E) "    /usr/sbin/useradd -c \"$(PEGASUS_FLAVOR)-pegasus OpenPegasus"\
             "WBEM/CIM services\" \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "        -g $(CIMSERVERMAIN_GRP) -s /sbin/nologin -r -d" \
             "%PEGASUS_VARDATA_DIR $(CIMSERVERMAIN_USR) \\" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -929,7 +934,7 @@ _append_postSectionToSpecFile: FORCE
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "       /etc/init.d/tog-pegasus stop" \
+       @$(ECHO-E) "       /etc/init.d/$(PEGASUS_FLAVOR)-pegasus stop" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "   if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \
@@ -957,7 +962,7 @@ ifeq ($(PEGASUS_ENABLE_PRIVILEGE_SEPARATION),true)
 endif
        @$(ECHO-E) "   if [ \"\044isRunning\" ]; then" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "       /etc/init.d/tog-pegasus start" \
+       @$(ECHO-E) "       /etc/init.d/$(PEGASUS_FLAVOR)-pegasus start" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "   fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@@ -1082,14 +1087,14 @@ _append_filesSectionToSpecFile: FORCE
              "$(PEGASUS_TRACE_DIR)" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%config %attr($(Prwxr_x___),$(INSTALL_USR),$(INSTALL_GRP))"\
-            "/etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+            "/etc/init.d/$(PEGASUS_FLAVOR)-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%config(noreplace)" \
             "%attr($(Prw_r__r__),$(CIMSERVER_USR),$(CIMSERVER_GRP))" \
             "$(PEGASUS_VARDATA_DIR)/$(PEGASUS_PLANNED_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%config(noreplace) $(PEGASUS_CONFIG_DIR)/access.conf" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
-       @$(ECHO-E) "%config(noreplace) $(PAM_CONFIG_DIR)/wbem" \
+       @$(ECHO-E) "%config(noreplace) $(PAM_CONFIG_DIR)/$(PAM_CONFIG_FILE)" \
             >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) ""  >> $(PEGASUS_RPM_SPEC_FILE_PATH)
        @$(ECHO-E) "%ghost %config(noreplace)" \

diff --git a/doc/BuildAndReleaseOptions.html b/doc/BuildAndReleaseOptions.html
index 9ac1b0122b37e375ad7f65d300bfbb6ac6424702..b8e76cafa208ebc459609ce2a39155aec97a1569 100644 (file)
--- a/doc/BuildAndReleaseOptions.html
+++ b/doc/BuildAndReleaseOptions.html
@@ -1690,6 +1690,29 @@ additional information.</p>
      titled "Configuration Properties" for additional detail.<br>
 </ul>
 
+<h5>PEGASUS_FLAVOR</h5>
+<ul>
+  <b>Description:&nbsp;</b> This variable is used for configuring Multi CIMOM 
+     on same OS by eliminating single point for storage of PID's and configuration
+     files. Flavor is used in structuring the release dirs,configuration file names,
+     log identity and PAM config file.
+     If set, OpenPegasus is built using the flavor value. By default OpenPegasus is
+     built using "tog" as the flavor. RPMs are named using the flavor value.
+  <br>
+  <b>Default Value:&nbsp;</b>tog<br>
+  <b>Recommended Value (Development Build):&nbsp;</b>tog<br>
+  <b>Recommended Value (Release Build):&nbsp;</b>tog<br>
+  <b>Required:&nbsp;</b>No<br>
+  <b>Considerations:&nbsp;</b>
+     To build RPM using flavor, RPM spec file needs to be regenerated after setting the flavor value.
+     This can be done using the create_OpenPegasusRPMSpecFile target in the Makefile.Release.
+     Platforms have to define their own release dir structure using the flavor for release builds.
+     An error will be reported if both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS are set and
+     PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS is not set.
+     RPM build on linux defines PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS by default.
+  <br>
+</ul>
+
 <h5>PEGASUS_USE_SQLITE_REPOSITORY</h5>
 <ul>
   <b>Description:&nbsp;</b>If true, new repository stores are created

diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index d63c20225053f0f83ef81ca655dbddde9442849d..d49a9ecc506812c51a6bb6d03d778903ab800c35 100644 (file)
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -32,7 +32,26 @@ PEGASUS_ENABLE_PRIVILEGE_SEPARATION=true
 
 PEGASUS_ENABLE_INTEROP_PROVIDER=false
 
+PEGASUS_FLAVOR = tog
+
+ifeq ($(PEGASUS_FLAVOR), tog)
+
 PEGASUS_PROD_DIR = /opt/wbem
+PEGASUS_VARDATA_DIR = /var/opt/wbem
+PEGASUS_CONFIG_DIR = /etc/opt/wbem
+PEGASUS_CIMSERVER_START_FILE = /etc/opt/wbem/cimserver_start.conf
+PEGASUS_PEM_DIR = /etc/opt/hp/sslshare
+
+else
+
+PEGASUS_PROD_DIR = /opt/$(PEGASUS_FLAVOR)-wbem
+PEGASUS_VARDATA_DIR = /var/opt/$(PEGASUS_FLAVOR)-wbem
+PEGASUS_CONFIG_DIR = /etc/opt/$(PEGASUS_FLAVOR)-wbem
+PEGASUS_CIMSERVER_START_FILE = /etc/opt/$(PEGASUS_FLAVOR)-wbem/cimserver_start.conf
+PEGASUS_PEM_DIR = /etc/opt/$(PEGASUS_FLAVOR)-hp/sslshare
+
+endif
+
 PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share
 PEGASUS_SCRIPT_DIR = $(PEGASUS_PRODSHARE_DIR)/scripts
 PEGASUS_DOC_DIR = $(PEGASUS_PRODSHARE_DIR)/doc
@@ -58,16 +77,15 @@ PEGASUS_PROVIDER_MANAGER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providerManagers
 
 PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin
 PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin
-PEGASUS_VARDATA_DIR = /var/opt/wbem
 PEGASUS_TRACE_DIR = $(PEGASUS_VARDATA_DIR)/trace
 PEGASUS_TRACE_FILE_PATH = $(PEGASUS_VARDATA_CACHE_DIR)/trace/cimserver.trc
 PEGASUS_CORE_DIR = $(PEGASUS_TRACE_DIR)
-PEGASUS_CIMSERVER_START_FILE = /etc/opt/wbem/cimserver_start.conf
+
 PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
 PEGASUS_REPOSITORY_PARENT_DIR = $(PEGASUS_VARDATA_DIR)
 PEGASUS_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/repository
 PEGASUS_PREV_REPOSITORY_DIR = $(PEGASUS_REPOSITORY_PARENT_DIR)/prev_repository
-PEGASUS_CONFIG_DIR = /etc/opt/wbem
+
 PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARDATA_DIR)/socket
 PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
 PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_DIR)/localauth
@@ -81,7 +99,6 @@ PEGASUS_CURRENT_CONFIG_FILE_PATH = \
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_PEM_DIR = /etc/opt/hp/sslshare
 PEGASUS_SSL_KEY_FILE = file.pem
 PEGASUS_SSL_KEY_FILE_PATH = $(PEGASUS_PEM_DIR)/$(PEGASUS_SSL_KEY_FILE)
 PEGASUS_SSL_CERT_FILE = cert.pem

diff --git a/env_var_Linux.status b/env_var_Linux.status
index cd7360b5e144a0b8cff848b20146439c5dc38811..733f7999f2960bfaffa709ba30cf0edf44f21d57 100644 (file)
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -13,8 +13,6 @@ PEGASUS_PRODUCT_VERSION="2.10.0"
 PEGASUS_PACKAGE_VERSION=1
 PEGASUS_PRODUCT_STATUS="Development"
 
-PAM_CONFIG_DIR=/etc/pam.d
-
 ifndef PEGASUS_STAGING_DIR
 PEGASUS_STAGING_DIR = $(PEGASUS_HOME)/stagingDir
 endif
@@ -44,7 +42,32 @@ PEGASUS_JVM=gcj
 JAVA_SDK=/usr/lib/jvm
 JAVA_SDKINC=/usr/lib/gcc/$(PEGASUS_JAVA_ARCH)-redhat-linux/4.1.1
 
+PEGASUS_FLAVOR = tog
+
+ifeq ($(PEGASUS_FLAVOR), tog)
+
 PEGASUS_PROD_DIR = /usr
+PEGASUS_VARDATA_DIR = /var/lib/Pegasus
+PEGASUS_CONFIG_DIR = /etc/Pegasus
+PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
+PAM_CONFIG_FILE=wbem
+
+else
+
+PEGASUS_PROD_DIR = /usr/local/$(PEGASUS_FLAVOR)-pegasus
+PEGASUS_VARDATA_DIR = $(PEGASUS_PROD_DIR)/var/Pegasus
+PEGASUS_CONFIG_DIR = $(PEGASUS_PROD_DIR)/etc/Pegasus
+PEGASUS_VARRUN_DIR = $(PEGASUS_PROD_DIR)/var/run/$(PEGASUS_FLAVOR)-pegasus
+PAM_CONFIG_FILE=wbem$(PEGASUS_FLAVOR)
+
+endif
+
+PAM_CONFIG_DIR=/etc/pam.d
+PEGASUS_DOC_DIR = $(PEGASUS_PROD_DIR)/share/doc/$(PEGASUS_FLAVOR)-pegasus-2.10
+PEGASUS_MAN_DIR = $(PEGASUS_PROD_DIR)/share/man
+PEGASUS_PRODSHARE_DIR = $(PEGASUS_PROD_DIR)/share/Pegasus
+PEGASUS_INCLUDE_DIR = $(PEGASUS_PROD_DIR)/include
+
 PEGASUS_SBIN_DIR = $(PEGASUS_PROD_DIR)/sbin
 PEGASUS_BIN_DIR = $(PEGASUS_PROD_DIR)/bin
 PEGASUS_DEST_LIB_DIR = $(PEGASUS_PROD_DIR)/$(PEGASUS_ARCH_LIB)
@@ -59,16 +82,12 @@ PEGASUS_PROVIDER_LIB_DIR_3 = $(PEGASUS_PROVIDER_DIR_3)/providers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR = $(PEGASUS_PROVIDER_DIR)/providerManagers
 PEGASUS_PROVIDER_MANAGER_LIB_DIR_2 = $(PEGASUS_PROVIDER_DIR_2)/providerManagers
 
-PEGASUS_DOC_DIR = /usr/share/doc/tog-pegasus-2.10
-PEGASUS_MAN_DIR = /usr/share/man
 PEGASUS_MANUSER_DIR = $(PEGASUS_MAN_DIR)/man1
 PEGASUS_MANADMIN_DIR = $(PEGASUS_MAN_DIR)/man8
 
-PEGASUS_PRODSHARE_DIR = /usr/share/Pegasus
 PEGASUS_SCRIPT_DIR = $(PEGASUS_PRODSHARE_DIR)/scripts
 PEGASUS_MOF_DIR = $(PEGASUS_PRODSHARE_DIR)/mof
 
-PEGASUS_VARDATA_DIR = /var/lib/Pegasus
 PEGASUS_REPOSITORY_PARENT_DIR = $(PEGASUS_VARDATA_DIR)
 PEGASUS_REPOSITORY_DIR_NAME = repository
 PEGASUS_REPOSITORY_DIR = \
@@ -91,9 +110,6 @@ PEGASUS_CURRENT_CONFIG_FILE_PATH = \
 PEGASUS_LOG_DIR = $(PEGASUS_VARDATA_DIR)/log
 PEGASUS_INSTALL_LOG = $(PEGASUS_LOG_DIR)/install.log
 
-PEGASUS_CONFIG_DIR = /etc/Pegasus
-
-PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
 PEGASUS_CIMSERVER_START_FILE = $(PEGASUS_VARRUN_DIR)/cimserver.pid
 PEGASUS_CIMSERVER_START_LOCK_FILE = $(PEGASUS_VARRUN_DIR)/cimserver_start.lock
 PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
@@ -115,7 +131,6 @@ PEGASUS_SAMPLES_DIR = $(PEGASUS_PRODSHARE_DIR)/samples
 PEGASUS_SAMPLES_OBJ_DIR = $(PEGASUS_SAMPLES_DIR)/obj
 PEGASUS_SAMPLES_LIB_DIR = $(PEGASUS_SAMPLES_DIR)/lib
 PEGASUS_SAMPLES_BIN_DIR = $(PEGASUS_SAMPLES_DIR)/bin
-PEGASUS_INCLUDE_DIR = /usr/include
 PEGASUS_HTML_DIR = $(PEGASUS_PRODSHARE_DIR)/html
 
 PEGASUS_TEST_DIR = $(PEGASUS_PRODSHARE_DIR)/test
@@ -123,37 +138,37 @@ PEGASUS_TEST_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)
 PEGASUS_TEST_REPOSITORY_NAME = testrepository
 
 PEGASUS_SYSTEM_DIRECTORIES = \
-   /usr \
-   /usr/sbin \
-   /usr/bin \
-   /usr/share \
-   /usr/share/doc \
-   /usr/share/man \
-   /usr/share/man/man1 \
-   /usr/share/man/man8 \
-   /etc \
-   /var \
-   /var/lib \
-   /var/run
+   $(PEGASUS_PROD_DIR) \
+   $(PEGASUS_PROD_DIR)/bin \
+   $(PEGASUS_PROD_DIR)/sbin \
+   $(PEGASUS_PROD_DIR)/share \
+   $(PEGASUS_PROD_DIR)/share/doc \
+   $(PEGASUS_PROD_DIR)/share/man \
+   $(PEGASUS_PROD_DIR)/share/man/man1 \
+   $(PEGASUS_PROD_DIR)/share/man/man8 \
+   $(PEGASUS_PROD_DIR)/etc \
+   $(PEGASUS_PROD_DIR)/var \
+   $(PEGASUS_PROD_DIR)/var/lib \
+   $(PEGASUS_PROD_DIR)/var/run
 
 # Only Pegasus-specific directories should be added to this list.
 
 PEGASUS_SPECIFIC_DIRECTORIES = \
    $(PEGASUS_DOC_DIR) \
-   /usr/share/Pegasus \
-   /usr/share/Pegasus/scripts \
-   /usr/share/Pegasus/mof \
-   /var/lib/Pegasus \
-   /var/lib/Pegasus/cache \
-   /var/lib/Pegasus/log \
-   /var/lib/Pegasus/cache/localauth \
-   /var/lib/Pegasus/cache/trace \
-   /var/run/tog-pegasus \
-   /etc/Pegasus
+   $(PEGASUS_PRODSHARE_DIR) \
+   $(PEGASUS_PRODSHARE_DIR)/scripts \
+   $(PEGASUS_PRODSHARE_DIR)/mof \
+   $(PEGASUS_VARDATA_DIR) \
+   $(PEGASUS_VARDATA_DIR)/cache \
+   $(PEGASUS_VARDATA_DIR)/log \
+   $(PEGASUS_VARDATA_DIR)/cache/localauth \
+   $(PEGASUS_VARDATA_DIR)/cache/trace \
+   $(PEGASUS_VARRUN_DIR) \
+   $(PEGASUS_CONFIG_DIR)
 
 PEGASUS_DIRECTORIES_TO_BE_REMOVED = \
    $(PEGASUS_DOC_DIR) \
-   /usr/share/Pegasus \
-   /var/lib/Pegasus \
-   /var/run/tog-pegasus \
-   /etc/Pegasus
+   $(PEGASUS_PRODSHARE_DIR) \
+   $(PEGASUS_VARDATA_DIR) \
+   $(PEGASUS_VARRUN_DIR) \
+   $(PEGASUS_CONFIG_DIR)

diff --git a/mak/config.mak b/mak/config.mak
index 406fd1fab18fca7b049c8fdac7696dbaaa4d36fe..000e0cc7e3f5060bac5282d9194373409cdafdc0 100644 (file)
--- a/mak/config.mak
+++ b/mak/config.mak
@@ -365,6 +365,7 @@ ifdef PEGASUS_HAS_MESSAGES
     endif
 endif
 
+
 ifeq ($(PEGASUS_HAS_ICU),true)
     DEFINES += -DPEGASUS_HAS_ICU
 
@@ -1477,3 +1478,14 @@ endif
 ifndef PLATFORM_CORE_PATTERN
     PLATFORM_CORE_PATTERN = core*
 endif
+
+ifdef PEGASUS_FLAVOR
+  ifdef PEGASUS_USE_RELEASE_DIRS
+    ifndef PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS
+      $(error "PEGASUS_OVERRIDE_DEFAULT_RELEASE_DIRS must be defined when both PEGASUS_FLAVOR and PEGASUS_USE_RELEASE_DIRS options are used")
+    endif
+  endif
+  ifneq ($(PEGASUS_FLAVOR), tog)
+      DEFINES += -DPEGASUS_FLAVOR=\"$(PEGASUS_FLAVOR)\"
+  endif
+endif

diff --git a/rpm/RPMMakefile b/rpm/RPMMakefile
index 050f828b28156e150fe7c0e9ac5a84822a9b76f3..190ea8b2c098af4b2d8b38912fbc2e36761df9d3 100644 (file)
--- a/rpm/RPMMakefile
+++ b/rpm/RPMMakefile
@@ -54,7 +54,7 @@ CP:=cp
 GREP:=grep
 ECHO:=echo
 ECHO-E:=echo -e
-TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep tog-pegasus)
+TOG_INSTALLED_RPMS:=$(shell $(RPM) -qa|grep $(PEGASUS_FLAVOR)-pegasus)
 
 ifdef PEGASUS_BUILD_BRANCH
     ifeq ($(PEGASUS_BUILD_BRANCH),MAIN)
@@ -117,15 +117,15 @@ ifndef PEGASUS_RPM_DIRECTORY
   endif
   TOG_PEGASUS_DIR:=""
 else
-  TOG_PEGASUS_DIR:=tog-pegasus
+  TOG_PEGASUS_DIR:=$(PEGASUS_FLAVOR)-pegasus
 endif
 
 VERSION:=$(PEGASUS_PRODUCT_VERSION)-$(PEGASUS_PACKAGE_VERSION)
-CORE_RPM:=tog-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
-SDK_RPM:=tog-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
-TEST_RPM:=tog-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
-SRC_RPM:=tog-pegasus-$(VERSION).src.rpm
-RPM_SRC_DIR:=$(shell echo tog-pegasus-$(PEGASUS_PRODUCT_VERSION))
+CORE_RPM:=$(PEGASUS_FLAVOR)-pegasus-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
+SDK_RPM:=$(PEGASUS_FLAVOR)-pegasus-devel-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
+TEST_RPM:=$(PEGASUS_FLAVOR)-pegasus-test-$(VERSION).$(PEGASUS_DISTRO_SUFFIX).$(PLATFORM).rpm
+SRC_RPM:=$(PEGASUS_FLAVOR)-pegasus-$(VERSION).src.rpm
+RPM_SRC_DIR:=$(shell echo $(PEGASUS_FLAVOR)-pegasus-$(PEGASUS_PRODUCT_VERSION))
 
 USAGE = @$(ECHO) $(1)
 
@@ -169,16 +169,16 @@ define removeRPM
 endef
 
 define startCIMServer
-       @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \
+       @/etc/init.d/$(PEGASUS_FLAVOR)-pegasus status > /dev/null 2>&1; \
         if [ $$? != 0 ]; then \
-            /etc/init.d/tog-pegasus start; \
+            /etc/init.d/$(PEGASUS_FLAVOR)-pegasus start; \
         fi
 endef
 
 define stopCIMServer
-       @/etc/init.d/tog-pegasus status > /dev/null 2>&1; \
+       @/etc/init.d/$(PEGASUS_FLAVOR)-pegasus status > /dev/null 2>&1; \
         if [ $$? == 0 ]; then \
-            /etc/init.d/tog-pegasus stop; \
+            /etc/init.d/$(PEGASUS_FLAVOR)-pegasus stop; \
         fi
 endef
 
@@ -205,8 +205,8 @@ endif
        @$(MV) pegasus $(RPM_SRC_DIR)
        @$(CP) $(RPM_SRC_DIR)/rpm/tog-pegasus.spec \
             $(PEGASUS_RPM_DIRECTORY)/SPECS
-       @tar czf tog-pegasus-$(VERSION).tar.gz $(RPM_SRC_DIR)
-       @$(CP) tog-pegasus-$(VERSION).tar.gz $(PEGASUS_RPM_DIRECTORY)/SOURCES/$(TOG_PEGASUS_DIR)
+       @tar czf $(PEGASUS_FLAVOR)-pegasus-$(VERSION).tar.gz $(RPM_SRC_DIR)
+       @$(CP) $(PEGASUS_FLAVOR)-pegasus-$(VERSION).tar.gz $(PEGASUS_RPM_DIRECTORY)/SOURCES/$(TOG_PEGASUS_DIR)
        @$(RPMBUILD) -bs $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec
 
 createBINRPM:
@@ -214,7 +214,7 @@ createBINRPM:
        @$(RPMBUILD) -bb --define 'LINUX_VERSION $(PEGASUS_DISTRO_SUFFIX)' --define 'PEGASUS_BUILD_TEST_RPM 1' $(PEGASUS_RPM_DIRECTORY)/SPECS/tog-pegasus.spec
 
 list:
-       @$(RPM) -qa|$(GREP) tog-pegasus
+       @$(RPM) -qa|$(GREP) $(PEGASUS_FLAVOR)-pegasus
 
 tests:
        # Start cimserver
@@ -273,10 +273,10 @@ install:
        $(PEGASUS_SCRIPT_DIR)/genOpenPegasusSSLCerts
 
 cleanRPM:
-       $(call removeRPM,tog-pegasus-test);
+       $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus-test);
        -$(call startCIMServer)
-       $(call removeRPM,tog-pegasus-devel);
-       $(call removeRPM,tog-pegasus);
+       $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus-devel);
+       $(call removeRPM,$(PEGASUS_FLAVOR)-pegasus);
        -$(RM) -Rf $(RPM_SRC_DIR).old
 ifneq ($(wildcard $(RPM_SRC_DIR)), )
        $(MV) $(RPM_SRC_DIR) $(RPM_SRC_DIR).old

diff --git a/rpm/commands-tog-pegasus.rc b/rpm/commands-tog-pegasus.rc
index 23244dc77fcab5535d83127d1d6eb9eceafaf34b..bc9b5f2ae33f2a3a5f2ebb31716d9132e26e7fd9 100644 (file)
--- a/rpm/commands-tog-pegasus.rc
+++ b/rpm/commands-tog-pegasus.rc
@@ -33,7 +33,7 @@ if [ ! -x $CIMSERVER_BIN ]; then
     exit 1;
 fi;
 
-[ -e /etc/sysconfig/tog-pegasus ] && . /etc/sysconfig/tog-pegasus;
+[ -e /etc/sysconfig/${PEGASUS_FLAVOR}-pegasus ] && . /etc/sysconfig/${PEGASUS_FLAVOR}-pegasus;
 
 . /lib/lsb/init-functions
 RETVAL=0
@@ -43,7 +43,7 @@ case "$1" in
        if [ ! -e ${PEGASUS_SSL_CONF_FILE} ] || [ ! -e ${PEGASUS_SSL_CERT_FILE} ] ||
           [ ! -e ${PEGASUS_SSL_KEY_FILE} ]  || [ ! -e ${PEGASUS_SSL_TRUSTSTORE} ]; then
           if [ -x $PEGASUS_SCRIPT_DIR/genOpenPegasusSSLCerts ]; then
-              echo -n "tog-pegasus: Generating cimserver SSL certificates...";
+              echo -n "$(PEGASUS_FLAVOR)-pegasus: Generating cimserver SSL certificates...";
               $PEGASUS_SCRIPT_DIR/genOpenPegasusSSLCerts;
               if [ $? -eq 0 ]; then
                   echo "SSL certificates generated";
@@ -62,7 +62,7 @@ case "$1" in
 
      stop)
        echo -n $"Shutting down CIM server: "
-       killproc cimserver
+       killproc $CIMSERVER_BIN
        RETVAL=$?
        [ "$RETVAL" -eq 0 ] && log_success_msg $"$prog stop" || log_failure_msg $"$prog stop"
        echo

diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index fd960833775fd3828c274677bd3878a385f1d971..49217206c9b7594f6f3f7ba0b6bdb33e321a3c6c 100644 (file)
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -39,6 +39,7 @@
 # be lost the next time this file is regenerated and submitted to CVS.
 #
 
+%define Flavor  tog
 %define packageVersion 1
 Version: 2.10.0
 Release: %{packageVersion}%{?LINUX_VERSION:.%{LINUX_VERSION}}
@@ -57,7 +58,7 @@ Epoch:   1
 %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0}
 
 Summary:   OpenPegasus WBEM Services for Linux
-Name:      tog-pegasus
+Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base
 License:   Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -101,8 +102,8 @@ Requires:           net-snmp
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec
 #
 Conflicts: openwbem
-Provides: tog-pegasus-cimserver
-BuildConflicts: tog-pegasus
+Provides: %{Flavor}-pegasus-cimserver
+BuildConflicts: %{Flavor}-pegasus
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver
@@ -174,8 +175,8 @@ sources.
 %package devel
 Summary: The OpenPegasus Software Development Kit
 Group: Systems Management/Base
-Requires: tog-pegasus >= %{version}
-Obsoletes: tog-pegasus-sdk
+Requires: %{Flavor}-pegasus >= %{version}
+Obsoletes: %{Flavor}-pegasus-sdk
 
 %description devel
 The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
@@ -187,7 +188,7 @@ supports C provider developers via the CMPI interface.
 %package test
 Summary: The OpenPegasus Tests
 Group: Systems Management/Base
-Requires: tog-pegasus >= %{version}
+Requires: %{Flavor}-pegasus >= %{version}
 
 %description test
 The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
@@ -299,7 +300,7 @@ fi
 if [ $1 -gt 0 ]; then
    #  Create the 'pegasus' user and group:
    /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;
-   /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \
+   /usr/sbin/useradd -c "%{Flavor}-pegasus OpenPegasus WBEM/CIM services" \
         -g pegasus -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR pegasus \
          > /dev/null 2>&1 || :;
 fi
@@ -358,11 +359,11 @@ if [ $1 -eq 1 ]; then
 
    if [ $1 -eq 1 ]; then
 %if %{AUTOSTART}
-       /sbin/chkconfig --add tog-pegasus
+       /sbin/chkconfig --add %{Flavor}-pegasus
 %endif
    :;
    elif [ $1 -gt 0 ]; then
-       /etc/init.d/tog-pegasus condrestart
+       /etc/init.d/%{Flavor}-pegasus condrestart
    :;
    fi
 #
@@ -398,7 +399,7 @@ if [ $1 -eq 0 ]; then
    if [ "$isRunning" ]; then
       %PEGASUS_SBIN_DIR/cimserver -s
    fi
-   /sbin/chkconfig --del tog-pegasus;
+   /sbin/chkconfig --del %{Flavor}-pegasus;
    rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;

diff --git a/rpm/tog-specfiles/tog-pegasus-desc.spec b/rpm/tog-specfiles/tog-pegasus-desc.spec
index d6c8af75e2019028962a3579610a5b060b6ffb7a..1c8d552b32032cdbb413db450c7cfefccaea875e 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-desc.spec
+++ b/rpm/tog-specfiles/tog-pegasus-desc.spec
@@ -1,8 +1,8 @@
 # Start of section pegasus/rpm/tog-specfiles/tog-pegasus-desc.spec
 #
 Conflicts: openwbem
-Provides: tog-pegasus-cimserver
-BuildConflicts: tog-pegasus
+Provides: %{Flavor}-pegasus-cimserver
+BuildConflicts: %{Flavor}-pegasus
 
 %description
 OpenPegasus WBEM Services for Linux enables management solutions that deliver

diff --git a/rpm/tog-specfiles/tog-pegasus-intro.spec b/rpm/tog-specfiles/tog-pegasus-intro.spec
index 2361876335c11d146f73c303f5422416b3e73a51..90759cd74d281d6052fa55b9b7f3302b24f014d1 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-intro.spec
+++ b/rpm/tog-specfiles/tog-pegasus-intro.spec
@@ -11,7 +11,7 @@
 %{?!JMPI_PROVIDER_REQUESTED: %define JMPI_PROVIDER_REQUESTED 0}
 
 Summary:   OpenPegasus WBEM Services for Linux
-Name:      tog-pegasus
+Name:      %{Flavor}-pegasus
 Group:     Systems Management/Base
 License:   Open Group Pegasus Open Source
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root

diff --git a/rpm/tog-specfiles/tog-pegasus-packages.spec b/rpm/tog-specfiles/tog-pegasus-packages.spec
index 138b80011ff77720c7cf3524d56f223add4fdc7a..bf9da09bf71f3c69192e77310ae26056e1666f0b 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-packages.spec
+++ b/rpm/tog-specfiles/tog-pegasus-packages.spec
@@ -3,8 +3,8 @@
 %package devel
 Summary: The OpenPegasus Software Development Kit
 Group: Systems Management/Base
-Requires: tog-pegasus >= %{version}
-Obsoletes: tog-pegasus-sdk
+Requires: %{Flavor}-pegasus >= %{version}
+Obsoletes: %{Flavor}-pegasus-sdk
 
 %description devel
 The OpenPegasus WBEM Services for Linux SDK is the developer's kit for the
@@ -16,7 +16,7 @@ supports C provider developers via the CMPI interface.
 %package test
 Summary: The OpenPegasus Tests
 Group: Systems Management/Base
-Requires: tog-pegasus >= %{version}
+Requires: %{Flavor}-pegasus >= %{version}
 
 %description test
 The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.

diff --git a/rpm/tog-specfiles/tog-pegasus-post.spec b/rpm/tog-specfiles/tog-pegasus-post.spec
index 65d973a68d630370125d765d0f24f431b2a6baba..437a5980328907da53cbb5f0f8caf003663e1b2d 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-post.spec
+++ b/rpm/tog-specfiles/tog-pegasus-post.spec
@@ -7,11 +7,11 @@
 
    if [ $1 -eq 1 ]; then
 %if %{AUTOSTART}
-       /sbin/chkconfig --add tog-pegasus
+       /sbin/chkconfig --add %{Flavor}-pegasus
 %endif
    :;
    elif [ $1 -gt 0 ]; then
-       /etc/init.d/tog-pegasus condrestart
+       /etc/init.d/%{Flavor}-pegasus condrestart
    :;
    fi
 #

diff --git a/rpm/tog-specfiles/tog-pegasus-pre.spec b/rpm/tog-specfiles/tog-pegasus-pre.spec
index 5b1073ef3ba57200bdd92e9ec72a760f6ce75ca9..09ecc10a23c897b795af518a9c37bb11b77d932f 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-pre.spec
+++ b/rpm/tog-specfiles/tog-pegasus-pre.spec
@@ -23,7 +23,7 @@ fi
 if [ $1 -gt 0 ]; then
    #  Create the 'pegasus' user and group:
    /usr/sbin/groupadd pegasus > /dev/null 2>&1 || :;
-   /usr/sbin/useradd -c "tog-pegasus OpenPegasus WBEM/CIM services" \
+   /usr/sbin/useradd -c "%{Flavor}-pegasus OpenPegasus WBEM/CIM services" \
         -g pegasus -s /sbin/nologin -r -d %PEGASUS_VARDATA_DIR pegasus \
          > /dev/null 2>&1 || :;
 fi

diff --git a/rpm/tog-specfiles/tog-pegasus-preun.spec b/rpm/tog-specfiles/tog-pegasus-preun.spec
index d1742751d55cfbb584e4a16cc8199df7a92579fa..5eb59c479ea6e2ab4687bd353c3dfba8923bdbdb 100644 (file)
--- a/rpm/tog-specfiles/tog-pegasus-preun.spec
+++ b/rpm/tog-specfiles/tog-pegasus-preun.spec
@@ -7,7 +7,7 @@ if [ $1 -eq 0 ]; then
    if [ "$isRunning" ]; then
       %PEGASUS_SBIN_DIR/cimserver -s
    fi
-   /sbin/chkconfig --del tog-pegasus;
+   /sbin/chkconfig --del %{Flavor}-pegasus;
    rm -f %PEGASUS_VARDATA_DIR/cimserver_current.conf;
    [ -d %PEGASUS_REPOSITORY_DIR ]  && rm -rf %PEGASUS_REPOSITORY_DIR;
    [ -d %PEGASUS_VARDATA_CACHE_DIR ]  && rm -rf %PEGASUS_VARDATA_CACHE_DIR;

diff --git a/src/Executor/PAMAuth.h b/src/Executor/PAMAuth.h
index 9d45983b5d4cb77fddbcd15c83aaed1656468711..e6fbd526ac5016b34b2c2584431e104889324141 100644 (file)
--- a/src/Executor/PAMAuth.h
+++ b/src/Executor/PAMAuth.h
@@ -49,6 +49,12 @@
 #include <Executor/Defines.h>
 #include <Executor/Socket.h>
 
+#ifdef PEGASUS_FLAVOR
+# define PAM_CONFIG_FILE "wbem" PEGASUS_FLAVOR
+#else
+# define PAM_CONFIG_FILE "wbem"
+#endif
+
 /*
 **==============================================================================
 **
@@ -403,7 +409,7 @@ static int PAMAuthenticateInProcess(
     pconv.appdata_ptr = &data;
 
 
-    if (pam_start("wbem", username, &pconv, &handle) != PAM_SUCCESS)
+    if (pam_start(PAM_CONFIG_FILE, username, &pconv, &handle) != PAM_SUCCESS)
         return -1;
 
     if (pam_authenticate(handle, 0) != PAM_SUCCESS)
@@ -442,7 +448,7 @@ static int PAMValidateUserInProcess(const char* username)
     pconv.conv = PAMValidateUserCallback;
     pconv.appdata_ptr = &data;
 
-    if (pam_start("wbem", username, &pconv, &phandle) != PAM_SUCCESS)
+    if (pam_start(PAM_CONFIG_FILE, username, &pconv, &phandle) != PAM_SUCCESS)
         return -1;
 
     if (pam_acct_mgmt(phandle, 0) != PAM_SUCCESS)

diff --git a/src/Executor/main.c b/src/Executor/main.c
index 1d1888a99d661d67464cc9235b9d6b8b16dce7cc..d27608b5b8c3ee0eb468c522e92b4833111f3da7 100644 (file)
--- a/src/Executor/main.c
+++ b/src/Executor/main.c
@@ -56,6 +56,12 @@
 
 #define CIMSERVER_COMMAND_TIMEOUT_SECONDS 240
 
+#ifdef PEGASUS_FLAVOR
+# define CIMSERVER_LOG_IDENTITY "cimserver" PEGASUS_FLAVOR
+#else
+# define CIMSERVER_LOG_IDENTITY "cimserver"
+#endif
+
 /*
 **==============================================================================
 **
@@ -266,6 +272,7 @@ void DefineExecutorMacros(void)
 **==============================================================================
 */
 
+
 int main(int argc, char** argv)
 {
     const char* cimservermainPath;
@@ -291,7 +298,7 @@ int main(int argc, char** argv)
 
     /* Open the log. */
 
-    OpenLog("cimserver");
+    OpenLog(CIMSERVER_LOG_IDENTITY);
 
     /* Define macros needed by the executor. */
 

diff --git a/src/Pegasus/Common/Constants.h b/src/Pegasus/Common/Constants.h
index d42758cfc193257e136820d025b61bb2f8981e9c..a66c349ff68ebc95c13f0030193b3a3061ba4d34 100644 (file)
--- a/src/Pegasus/Common/Constants.h
+++ b/src/Pegasus/Common/Constants.h
@@ -336,10 +336,19 @@
 # else
 #  define PEGASUS_CIMSERVER_STARTFILES_DIR "/tmp"
 # endif
+
+#ifdef PEGASUS_FLAVOR
+# define PEGASUS_CIMSERVER_START_FILE      \
+    PEGASUS_CIMSERVER_STARTFILES_DIR "/cimserver" PEGASUS_FLAVOR "_start.conf"
+# define PEGASUS_CIMSERVER_START_LOCK_FILE \
+    PEGASUS_CIMSERVER_STARTFILES_DIR "/cimserver" PEGASUS_FLAVOR "_start.lock"
+#else
 # define PEGASUS_CIMSERVER_START_FILE      \
     PEGASUS_CIMSERVER_STARTFILES_DIR "/cimserver_start.conf"
 # define PEGASUS_CIMSERVER_START_LOCK_FILE \
     PEGASUS_CIMSERVER_STARTFILES_DIR "/cimserver_start.lock"
+#endif
+
 # define PEGASUS_REPOSITORY_DIR            "repository"
 # define PEGASUS_CURRENT_CONFIG_FILE_PATH  "cimserver_current.conf"
 # define PEGASUS_PLANNED_CONFIG_FILE_PATH  "cimserver_planned.conf"
@@ -347,8 +356,15 @@
 # define PEGASUS_SSLCLIENT_RANDOMFILE      "ssl.rnd"
 # define PEGASUS_SSLSERVER_RANDOMFILE      "cimserver.rnd"
 # define PEGASUS_LOCAL_AUTH_DIR            PEGASUS_CIMSERVER_STARTFILES_DIR
+
+#ifdef PEGASUS_FLAVOR
+# define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  \
+    PEGASUS_CIMSERVER_STARTFILES_DIR "/cimxml" PEGASUS_FLAVOR ".socket"
+#else
 # define PEGASUS_LOCAL_DOMAIN_SOCKET_PATH  \
     PEGASUS_CIMSERVER_STARTFILES_DIR "/cimxml.socket"
+#endif
+
 # define PEGASUS_PAM_STANDALONE_PROC_NAME  "bin/cimservera"
 # define PEGASUS_PROVIDER_AGENT_PROC_NAME  "bin/cimprovagt"
 # undef PEGASUS_DEFAULT_MESSAGE_SOURCE      /* Not defined */

diff --git a/src/Pegasus/Common/System.cpp b/src/Pegasus/Common/System.cpp
index ea21d551979afec9d76fdd8e9819cf383d9941b3..6e6677ccb5487f284cf0e35fab928e15a0149eef 100644 (file)
--- a/src/Pegasus/Common/System.cpp
+++ b/src/Pegasus/Common/System.cpp
@@ -947,6 +947,10 @@ int System::getNameInfo(
 #endif
 
 // System ID constants for Logger::put and Logger::trace
+#ifdef PEGASUS_FLAVOR
+const String System::CIMLISTENER = "cimlistener" PEGASUS_FLAVOR;
+#else
 const String System::CIMLISTENER = "cimlistener"; // Listener systme ID
+#endif
 
 PEGASUS_NAMESPACE_END

diff --git a/src/Pegasus/Common/SystemPOSIX.cpp b/src/Pegasus/Common/SystemPOSIX.cpp
index 5c8f7f07536e9e05b8d976c9a4181ca3c0b70fda..753dc35786c2146746b800805fb3a7dff9c98bc3 100644 (file)
--- a/src/Pegasus/Common/SystemPOSIX.cpp
+++ b/src/Pegasus/Common/SystemPOSIX.cpp
@@ -81,10 +81,18 @@ PEGASUS_NAMESPACE_BEGIN
 
 // System ID constants for Logger::put and Logger::trace
 #if defined(PEGASUS_OS_ZOS)
+# ifdef PEGASUS_FLAVOR
+  const String System::CIMSERVER = "CFZCIM" PEGASUS_FLAVOR;
+# else
 const String System::CIMSERVER = "CFZCIM";  // Server system ID
+# endif
+#else
+# ifdef PEGASUS_FLAVOR
+  const String System::CIMSERVER = "cimserver" PEGASUS_FLAVOR;//Server system ID
 #else
 const String System::CIMSERVER = "cimserver";  // Server system ID
 #endif
+#endif
 
 void System::getCurrentTime(Uint32& seconds, Uint32& milliseconds)
 {

diff --git a/src/Pegasus/Config/FixedPropertyTableAix.h b/src/Pegasus/Config/FixedPropertyTableAix.h
index 2a2eac145d1707564efa2cbb9a3e4f948ab3bdb2..5434b9ff4601e533cfb67a54476718b424e59997 100644 (file)
--- a/src/Pegasus/Config/FixedPropertyTableAix.h
+++ b/src/Pegasus/Config/FixedPropertyTableAix.h
@@ -32,8 +32,10 @@
 #ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
 
     {"logLevel",            "INFORMATION"},
+#ifndef PEGASUS_FLAVOR
     {"httpPort",            "5988"},
     {"httpsPort",           "5989"},
+#endif
     {"daemon",              "true"},
 #ifdef PEGASUS_ENABLE_SLP
     {"slp",                 "false"},

diff --git a/src/Pegasus/Config/FixedPropertyTableHpux.h b/src/Pegasus/Config/FixedPropertyTableHpux.h
index 3f145d732b1413836c43e9c16e644cd34ed6a6f3..249939b7f6c0702e8794a38c43b966a12870ad95 100644 (file)
--- a/src/Pegasus/Config/FixedPropertyTableHpux.h
+++ b/src/Pegasus/Config/FixedPropertyTableHpux.h
@@ -36,8 +36,10 @@
 
 #ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
     {"logLevel",            "INFORMATION"},
+#ifndef PEGASUS_FLAVOR
     {"httpPort",            "5988"},
     {"httpsPort",           "5989"},
+#endif
     {"daemon",              "true"},
 #ifdef PEGASUS_ENABLE_SLP
     {"slp",                 "false"},

diff --git a/src/Pegasus/Config/FixedPropertyTableLinux.h b/src/Pegasus/Config/FixedPropertyTableLinux.h
index e250e7a488df776f48e79cefe20f687f4b1f2b67..b4f07a67b200fe2dd7fd8eb54b1514015d5f53bb 100644 (file)
--- a/src/Pegasus/Config/FixedPropertyTableLinux.h
+++ b/src/Pegasus/Config/FixedPropertyTableLinux.h
@@ -37,8 +37,10 @@
 #endif
 
 #ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
+#ifndef PEGASUS_FLAVOR
     {"httpPort",            "5988"},
     {"httpsPort",           "5989"},
+#endif
 #ifdef PEGASUS_ENABLE_SLP
     {"slp",                 "false"},
 #endif

diff --git a/src/Pegasus/Config/FixedPropertyTableSolaris.h b/src/Pegasus/Config/FixedPropertyTableSolaris.h
index f2e5c9be47b7c66902ebb5c389f2490d603252b9..b5484fdb3520c8581e3281d725682bbde1325d5c 100644 (file)
--- a/src/Pegasus/Config/FixedPropertyTableSolaris.h
+++ b/src/Pegasus/Config/FixedPropertyTableSolaris.h
@@ -37,8 +37,10 @@
 #endif
 
 #ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
+#ifndef PEGASUS_FLAVOR
     {"httpPort",            "5988"},
     {"httpsPort",           "5989"},
+#endif
 #ifdef PEGASUS_ENABLE_SLP
     {"slp",                 "false"},
 #endif

diff --git a/src/Pegasus/Config/FixedPropertyTableVms.h b/src/Pegasus/Config/FixedPropertyTableVms.h
index d29d037afa12ab02386b717ed0e414bd3417c13c..d64b1971997545a1161c8df66b0aa6b6be18883c 100755 (executable)
--- a/src/Pegasus/Config/FixedPropertyTableVms.h
+++ b/src/Pegasus/Config/FixedPropertyTableVms.h
@@ -33,8 +33,10 @@
 #define Pegasus_FixedPropertyTableVms_h
 
 #ifdef PEGASUS_USE_RELEASE_CONFIG_OPTIONS
+#ifndef PEGASUS_FLAVOR
     {"httpPort",            "5988"},
     {"httpsPort",           "5989"},
+#endif
     {"daemon",              "false"},
 #ifdef PEGASUS_ENABLE_SLP
     {"slp",                 "false"},

diff --git a/src/Pegasus/ControlProviders/InteropProvider/Server.cpp b/src/Pegasus/ControlProviders/InteropProvider/Server.cpp
index 7e2b5fd1e73e037708219b7ef0f1a4c9addf2e93..c2a542ece4e05a01a7d33111b6ce274bd8b8ded8 100644 (file)
--- a/src/Pegasus/ControlProviders/InteropProvider/Server.cpp
+++ b/src/Pegasus/ControlProviders/InteropProvider/Server.cpp
@@ -438,7 +438,14 @@ CIMInstance InteropProvider::getObjectManagerInstance()
             PEGASUS_CLASSNAME_PG_OBJECTMANAGER.getString());
         setPropertyValue(instance, OM_PROPERTY_NAME,
             String(PEGASUS_INSTANCEID_GLOBAL_PREFIX) + ":" + Guid::getGuid());
+#ifdef PEGASUS_FLAVOR
+        String elementName(PEGASUS_FLAVOR);
+        elementName.append(Char16('-'));
+        elementName.append("pegasus");
+        setPropertyValue(instance, OM_PROPERTY_ELEMENTNAME, elementName);
+#else
         setPropertyValue(instance, OM_PROPERTY_ELEMENTNAME, String("Pegasus"));
+#endif
         Array<Uint16> operationalStatus;
         operationalStatus.append(2);
         setPropertyValue(instance, OM_PROPERTY_OPERATIONALSTATUS,