From e9a21e4b5bae651e5618902af1590b5dbbff6eed Mon Sep 17 00:00:00 2001 From: wanghuaz Date: Mon, 20 Dec 2010 09:29:39 +0000 Subject: [PATCH] Fixed bug 3131136: we have seen it many times, there are no any pid files in the system and it makes our code cannot restart conserver daemon. Now we will restart conserver once user run makeconserver. It may introduce some warning msg if we try to stop conserver daemon which is not existing git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8475 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/conserver.pm | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/conserver.pm b/xCAT-server/lib/xcat/plugins/conserver.pm index c563bf5fa..0be8319fa 100644 --- a/xCAT-server/lib/xcat/plugins/conserver.pm +++ b/xCAT-server/lib/xcat/plugins/conserver.pm @@ -398,25 +398,15 @@ sub makeconservercf { #restart conserver daemon my $cmd; if(xCAT::Utils->isAIX()){ - if (-f "/var/run/conserver.pid") { $cmd = "stopsrc -s conserver"; xCAT::Utils->runcmd($cmd, 0); $cmd = "startsrc -s conserver"; xCAT::Utils->runcmd($cmd, 0); - } else { - $cmd = "startsrc -s conserver"; - xCAT::Utils->runcmd($cmd, 0); - } } else { - if (-f "/var/run/conserver.pid") { $cmd = "/etc/init.d/conserver stop"; xCAT::Utils->runcmd($cmd, 0); $cmd = "/etc/init.d/conserver start"; xCAT::Utils->runcmd($cmd, 0); - } else { - $cmd = "/etc/init.d/conserver start"; - xCAT::Utils->runcmd($cmd, 0); - } } } }