From 3d968e73770a2e9c3a00b6a39ab3e3c92a0dc6a2 Mon Sep 17 00:00:00 2001 From: lissav Date: Fri, 22 Jan 2010 14:06:02 +0000 Subject: [PATCH] change so xCATsn rpm will not install if the xCAT metapkg is installed, also remove /etc/xCATSN when uninstall git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5012 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCATsn/xCATsn.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xCATsn/xCATsn.spec b/xCATsn/xCATsn.spec index 86a1b65ab..a8ba4fe56 100644 --- a/xCATsn/xCATsn.spec +++ b/xCATsn/xCATsn.spec @@ -15,6 +15,7 @@ Source1: xcat.conf Source2: license.tar.gz Provides: xCATsn = %{version} Requires: xCAT-server xCAT-client perl-xCAT perl-XML-Parser +Conflicts: xCAT-2 %ifos linux # yaboot-xcat is pulled in so any SN can manage ppc nodes @@ -76,8 +77,7 @@ if [ -f /etc/xCATMN ]; then fi -### Start the xcatd daemon - +# start xcatd chkconfig httpd on if [ -f "/proc/cmdline" ]; then # prevent running it during install into chroot image XCATROOT=$RPM_INSTALL_PREFIX0 /etc/init.d/xcatd start @@ -95,3 +95,6 @@ fi /etc/httpd/conf.d/xcat.conf /etc/apache2/conf.d/xcat.conf %defattr(-,root,root) +%postun +# removes SN file + rm /etc/xCATSN