From c5e82bb0fd72b1bca13bb4014e552f2fcf2f3973 Mon Sep 17 00:00:00 2001 From: huweihua Date: Wed, 19 Nov 2014 06:09:23 -0500 Subject: [PATCH] fix defect4414: if there is rsync service already run, sysclone rsync server start unsuccessfully. --- xCAT-server/lib/xcat/plugins/anaconda.pm | 5 +++++ xCAT-server/lib/xcat/plugins/sles.pm | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index ce84709ee..79f655f72 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -2080,6 +2080,11 @@ sub mksysclone if($retcode!=0){ my $rc = xCAT::Utils->startservice("systemimager-server-rsyncd"); if ($rc != 0) { + $callback->( + {error => ["systemimager-server-rsyncd start unsuccessfully. please check if there is rsync service already run in your s +erver, if so, stop it first and try again"], + errorcode => [1]} + ); return 1; } } diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 032df544e..1cf90e08d 100755 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -1587,6 +1587,11 @@ sub mksysclone if($retcode !=0){ my $rc = xCAT::Utils->startservice("systemimager-server-rsyncd"); if ($rc != 0) { + $callback->( + {error => ["systemimager-server-rsyncd start unsuccessfully. please check if there is rsync service already run in your s +erver, if so, stop it first and try again"], + errorcode => [1]} + ); return 1; } }