summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorw.otsuka <w.otsuka>2005-11-08 21:55:30 +0000
committerw.otsuka <w.otsuka>2005-11-08 21:55:30 +0000
commit51a787f401859fba4dbea4f08dade1694cf07d2b (patch)
treef3ea5b95d112744e7604564c53869fe69db6aeff
parent5ea6ca1383b30d3e92fdddcee0e27eaba74ba2ee (diff)
downloadtog-pegasus-51a787f401859fba4dbea4f08dade1694cf07d2b.zip
tog-pegasus-51a787f401859fba4dbea4f08dade1694cf07d2b.tar.gz
tog-pegasus-51a787f401859fba4dbea4f08dade1694cf07d2b.tar.xz
BUG#: 4374
TITLE:tog-pegaus rpm upgrade removes modified config files DESCRIPTION: Add noreplace to %config for /etc/pam.d/wbem and /etc/init.d/tog-pegasus.
-rw-r--r--Makefile.Release4
-rw-r--r--rpm/tog-pegasus.spec4
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.Release b/Makefile.Release
index ee546e4..a7bf333 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -1026,8 +1026,8 @@ _append_filesSectionToSpecFile: FORCE
@$(ECHO-E) "" >> $(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 %attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) /etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
- @$(ECHO-E) "%config %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) %PAM_CONFIG_DIR/wbem" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%config(noreplace) %attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) /etc/init.d/tog-pegasus" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) "%config(noreplace) %attr($(Pr__r__r__),$(INSTALL_USR),$(INSTALL_GRP)) %PAM_CONFIG_DIR/wbem" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) "" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(foreach i, $(PEGASUS_ADMIN_CMDS), \
$(ECHO-E) "%attr($(Pr_x______),$(INSTALL_USR),$(INSTALL_GRP)) $(PEGASUS_SBIN_DIR)/$(i)" >> $(PEGASUS_RPM_SPEC_FILE_PATH);)
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index c711df7..1eb347d 100644
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -526,8 +526,8 @@ fi
%attr(444,root,root) /opt/tog-pegasus/mof/Pegasus/PG_UnixProcess20R.mof
%config(noreplace) %attr(644,root,root) /var/opt/tog-pegasus/cimserver_planned.conf
-%config %attr(500,root,root) /etc/init.d/tog-pegasus
-%config %attr(444,root,root) %PAM_CONFIG_DIR/wbem
+%config(noreplace) %attr(500,root,root) /etc/init.d/tog-pegasus
+%config(noreplace) %attr(444,root,root) %PAM_CONFIG_DIR/wbem
%attr(500,root,root) /opt/tog-pegasus/sbin/cimauth
%attr(500,root,root) /opt/tog-pegasus/sbin/cimconfig