summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorw.otsuka <w.otsuka>2005-07-12 22:47:49 +0000
committerw.otsuka <w.otsuka>2005-07-12 22:47:49 +0000
commit938c55a9b8f0e1b506c06848b99db7b212c5249a (patch)
treec0cfc4bc1c0aa842399b6e5cceabde9f005212a0
parent22fd55ed7af6ba92bc33fe9d0639814c65cfb5a9 (diff)
downloadtog-pegasus-938c55a9b8f0e1b506c06848b99db7b212c5249a.zip
tog-pegasus-938c55a9b8f0e1b506c06848b99db7b212c5249a.tar.gz
tog-pegasus-938c55a9b8f0e1b506c06848b99db7b212c5249a.tar.xz
BUG#: 3909
TITLE: init_repository.: Has not been updated to work with CIM29 mof file names. DESCRIPTION: Add new environment PEGASUS_CIMXX_MOF_DIR which is the directory path to the schema files. For example, for linux releases this would be /opt/tog-pegasus/mof/CIM29.
-rw-r--r--Makefile.Release1
-rwxr-xr-xinstalls/scripts/init_repository8
2 files changed, 5 insertions, 4 deletions
diff --git a/Makefile.Release b/Makefile.Release
index a00704d..bc7ee35 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -490,6 +490,7 @@ stage_PegasusAdminCmdsDirectoryFiles: FORCE
$(foreach i, $(INSTALL_SCRIPT_FILES), $(COPY) $(PEGASUS_ROOT)/installs/scripts/$(i) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/$(i);)
@$(RM) $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
@$(ECHO-E) "PEGASUS_MOF_DIR=$(PEGASUS_MOF_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
+ @$(ECHO-E) "PEGASUS_CIMXX_MOF_DIR=$(PEGASUS_MOF_DIR)/$(PEGASUS_CIM_SCHEMA)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
@$(ECHO-E) "PEGASUS_REPOSITORY_DIR=$(PEGASUS_REPOSITORY_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
@$(ECHO-E) "PEGASUS_BIN_DIR=$(PEGASUS_BIN_DIR)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
@$(ECHO-E) "PEGASUS_CIM_SCHEMA=$(PEGASUS_CIM_SCHEMA_VERSION)" >> $(PEGASUS_STAGING_DIR)$(PEGASUS_SBIN_DIR)/init_repository
diff --git a/installs/scripts/init_repository b/installs/scripts/init_repository
index eb22669..e6220d0 100755
--- a/installs/scripts/init_repository
+++ b/installs/scripts/init_repository
@@ -24,8 +24,8 @@
INTEROPNS=root/PG_InterOp
-$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA -n$INTEROPNS $PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA/CIM_Core$PEGASUS_CIM_SCHEMA.mof
-$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA -n$INTEROPNS $PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA/CIM_Event$PEGASUS_CIM_SCHEMA.mof
+$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_CIMXX_MOF_DIR -n$INTEROPNS $PEGASUS_CIMXX_MOF_DIR/CIM_Core$PEGASUS_CIM_SCHEMA.mof
+$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_CIMXX_MOF_DIR -n$INTEROPNS $PEGASUS_CIMXX_MOF_DIR/CIM_Event$PEGASUS_CIM_SCHEMA.mof
$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$INTEROPNS $PEGASUS_MOF_DIR/Pegasus/PG_InterOpSchema20.mof
#
@@ -34,7 +34,7 @@ $PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$INTEROPNS $PEGASUS_MOF_DIR
INTERNALNS=root/PG_Internal
-$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA -n$INTERNALNS $PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA/Core$PEGASUS_CIM_SCHEMA\_Qualifiers.mof
+$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_CIMXX_MOF_DIR -n$INTERNALNS $PEGASUS_CIMXX_MOF_DIR/Core$PEGASUS_CIM_SCHEMA\_Qualifiers.mof
$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$INTERNALNS $PEGASUS_MOF_DIR/Pegasus/PG_InternalSchema20.mof
#
@@ -43,6 +43,6 @@ $PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$INTERNALNS $PEGASUS_MOF_DI
MANAGEDSYSTEMNS=root/cimv2
-$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA -n$MANAGEDSYSTEMNS $PEGASUS_MOF_DIR/CIM$PEGASUS_CIM_SCHEMA/CIM_Schema$PEGASUS_CIM_SCHEMA.mof
+$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_CIMXX_MOF_DIR -n$MANAGEDSYSTEMNS $PEGASUS_CIMXX_MOF_DIR/CIM_Schema$PEGASUS_CIM_SCHEMA.mof
$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$MANAGEDSYSTEMNS $PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20.mof
$PEGASUS_BIN_DIR/cimmof -I$PEGASUS_MOF_DIR/Pegasus -n$INTEROPNS $PEGASUS_MOF_DIR/Pegasus/PG_ManagedSystemSchema20R.mof