summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordenise.eckstein <denise.eckstein>2005-04-10 06:24:52 +0000
committerdenise.eckstein <denise.eckstein>2005-04-10 06:24:52 +0000
commit5f6484f0ed7c1db46da99916aa62a007a485e255 (patch)
tree2f527265e82cb4a725600e8902fb46de1387cb0c
parent41e04158fd65d8a2a870abbce2fe2d462a9569e7 (diff)
downloadtog-pegasus-5f6484f0ed7c1db46da99916aa62a007a485e255.zip
tog-pegasus-5f6484f0ed7c1db46da99916aa62a007a485e255.tar.gz
tog-pegasus-5f6484f0ed7c1db46da99916aa62a007a485e255.tar.xz
BUG#: 3086
TITLE: Need automated mechanism to generate tog-pegasus.spec DESCRIPTION: More uninstall cleanup to remove socket file and directory.
-rw-r--r--Makefile.Release2
-rw-r--r--env_var_HPUX.status1
-rw-r--r--env_var_Linux.status1
-rw-r--r--rpm/tog-pegasus.spec1
4 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.Release b/Makefile.Release
index 9355e6a..db211c7 100644
--- a/Makefile.Release
+++ b/Makefile.Release
@@ -778,6 +778,8 @@ _append_preunSectionToSpecFile: FORCE
$(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " [ -d $(PEGASUS_REPOSITORY_DIR) ] && rm -rf $(PEGASUS_REPOSITORY_DIR);" >> \
$(PEGASUS_RPM_SPEC_FILE_PATH)
+ @$(ECHO-E) " [ -f $(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH) ] && rm $(PEGASUS_LOCAL_DOMAIN_SOCKET_PATH);" >> \
+ $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " fi" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " # Delete the Link to the rc.* Startup Directories" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
@$(ECHO-E) " /usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;" >> $(PEGASUS_RPM_SPEC_FILE_PATH)
diff --git a/env_var_HPUX.status b/env_var_HPUX.status
index ffe955d..91a5d2a 100644
--- a/env_var_HPUX.status
+++ b/env_var_HPUX.status
@@ -42,6 +42,7 @@ PEGASUS_VARDATA_DIR = /var/opt/wbem
PEGASUS_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)/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
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
PEGASUS_PEM_DIR = /etc/opt/hp/sslshare
diff --git a/env_var_Linux.status b/env_var_Linux.status
index 6f3ff98..48b0fb2 100644
--- a/env_var_Linux.status
+++ b/env_var_Linux.status
@@ -47,6 +47,7 @@ PEGASUS_PREV_REPOSITORY_DIR = $(PEGASUS_VARDATA_DIR)/prev_repository
PEGASUS_CONFIG_DIR = /etc/opt/tog-pegasus
PEGASUS_VARRUN_DIR = /var/run/tog-pegasus
PEGASUS_LOCAL_DOMAIN_SOCKET_DIR = $(PEGASUS_VARRUN_DIR)/socket
+PEGASUS_LOCAL_DOMAIN_SOCKET_PATH = $(PEGASUS_LOCAL_DOMAIN_SOCKET_DIR)/cimxml.socket
PEGASUS_VARDATA_CACHE_DIR = $(PEGASUS_VARDATA_DIR)/cache
PEGASUS_LOCAL_AUTH_DIR = $(PEGASUS_VARDATA_CACHE_DIR)/localauth
PEGASUS_PLANNED_CONFIG_FILE = cimserver_planned.conf
diff --git a/rpm/tog-pegasus.spec b/rpm/tog-pegasus.spec
index 2235a65..da69d46 100644
--- a/rpm/tog-pegasus.spec
+++ b/rpm/tog-pegasus.spec
@@ -297,6 +297,7 @@ if [ $1 -eq 0 ]; then
[ -f /var/opt/tog-pegasus/cimserver_current.conf ] && rm /var/opt/tog-pegasus/cimserver_current.conf;
[ -f %PEGASUS_INSTALL_LOG ] && rm %PEGASUS_INSTALL_LOG;
[ -d /var/opt/tog-pegasus/repository ] && rm -rf /var/opt/tog-pegasus/repository;
+ [ -f /var/run/tog-pegasus/socket/cimxml.socket ] && rm /var/run/tog-pegasus/socket/cimxml.socket;
fi
# Delete the Link to the rc.* Startup Directories
/usr/lib/lsb/remove_initd /etc/init.d/tog-pegasus;