summaryrefslogtreecommitdiffstats
path: root/Makefile.Release
diff options
context:
space:
mode:
authorsushma.fernandes <sushma.fernandes>2007-10-01 20:15:23 +0000
committersushma.fernandes <sushma.fernandes>2007-10-01 20:15:23 +0000
commit1d9a0b9a14fe4425bd4991ac3c729c3fc2a4842c (patch)
tree8b81783f5394818aa0a48085dfa294edd6828248 /Makefile.Release
parentd2b709557c1d2dd98e8c554d98ae7dc555c13821 (diff)
downloadtog-pegasus-1d9a0b9a14fe4425bd4991ac3c729c3fc2a4842c.zip
tog-pegasus-1d9a0b9a14fe4425bd4991ac3c729c3fc2a4842c.tar.gz
tog-pegasus-1d9a0b9a14fe4425bd4991ac3c729c3fc2a4842c.tar.xz
BUG#: 6982
TITLE: tog-pegasus-post.spec passes incorrect command line options to repupgrade DESCRIPTION: Updated the rpm specfiles to remove the incorrect repupgrade call and to set correct permissions on the upgraded repository when privilege separation is enabled.
Diffstat (limited to 'Makefile.Release')
-rw-r--r--Makefile.Release22
1 files changed, 15 insertions, 7 deletions
diff --git a/Makefile.Release b/Makefile.Release
index ce7e6d6..6019274 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -884,13 +884,6 @@ _append_postSectionToSpecFile: FORCE
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "elif [ \044\061 -gt 1 ]; then" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \
- >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " # Running Repository Upgrade utility" \
- >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " %PEGASUS_SBIN_DIR/repupgrade 2>>%PEGASUS_INSTALL_LOG" \
- >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " # Check if the cimserver is running" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " isRunning=\`ps -el | grep cimserver | grep -v" \
@@ -901,6 +894,21 @@ _append_postSectionToSpecFile: FORCE
@$(ECHO-E) " /etc/init.d/tog-pegasus stop" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " if [ -d %PEGASUS_PREV_REPOSITORY_DIR ]; then" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " # The old repository was moved to" \
+ "/var/lib/Pegasus/prev_repository. It should now be" \
+ "upgraded to the new repository /var/lib/Pegasus/repository." \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " %PEGASUS_SBIN_DIR/repupgrade >> %PEGASUS_INSTALL_LOG 2>&1" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
+ @$(ECHO-E) " chown -R $(CIMSERVERMAIN_USR) %PEGASUS_REPOSITORY_DIR" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " chgrp -R $(CIMSERVERMAIN_GRP) %PEGASUS_REPOSITORY_DIR" \
+ >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+endif
+ @$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
ifdef PEGASUS_ENABLE_PRIVILEGE_SEPARATION
@$(ECHO-E) " if [ -f %PEGASUS_TRACE_FILE_PATH ]; then" \
>> $(PEGASUS_RPM_SPEC_FILE_PATH)