From 260e24bfc67954205932a1440c144c2a777c3f9d Mon Sep 17 00:00:00 2001
From: Fabian Arrotin <arrfab@centos.org>
Date: May 20 2014 06:25:42 +0000
Subject: Fixed the p_rsync test (systemctl for rsyncd service and no xinetd

anymore)

---

diff --git a/tests/p_rsync/0-install-rsync.sh b/tests/p_rsync/0-install-rsync.sh
index f0efada..50637cf 100755
--- a/tests/p_rsync/0-install-rsync.sh
+++ b/tests/p_rsync/0-install-rsync.sh
@@ -4,8 +4,11 @@
 t_Log "Running $0 - installing rsync and xinetd."
 t_InstallPackage xinetd rsync
 
-# enable rsync in /etc/xinet.d/rsync
-sed -i 's/\(disable\s*=\ \)yes/\1no/' /etc/xinetd.d/rsync
-
 # Restart in case previous tests allready installed xinetd
-t_ServiceControl xinetd restart
+if [ "$centos_ver" = "7" ] ; then
+ systemctl start rsyncd.service
+else
+ # enable rsync in /etc/xinet.d/rsync
+ sed -i 's/\(disable\s*=\ \)yes/\1no/' /etc/xinetd.d/rsync
+ t_ServiceControl xinetd restart
+fi
diff --git a/tests/p_rsync/10-rsync-test.sh b/tests/p_rsync/10-rsync-test.sh
index 41625d5..7756168 100755
--- a/tests/p_rsync/10-rsync-test.sh
+++ b/tests/p_rsync/10-rsync-test.sh
@@ -13,6 +13,7 @@ cat > $PATH2FILE/$FILE <<EOF
 Testing rsync
 EOF
 
+# Creating rsyncd config file
 cat > /etc/rsyncd.conf <<EOF
 gid = root
 uid = root
@@ -28,8 +29,11 @@ hosts allow = 127.0.0.1
  include = $FILE
 EOF
 
-t_ServiceControl xinetd restart
-
+if [ "$centos_ver" = "7" ] ; then
+ systemctl start rsyncd.service
+else
+ t_ServiceControl xinetd restart
+fi
 
 # Fix SELinux
 chcon -R -t public_content_t $PATH2FILE
@@ -39,9 +43,13 @@ rsync --recursive --verbose --include=$FILE --exclude=* rsync://127.0.0.1/centos
 
 t_CheckExitStatus $?
 
-#reversing changes
+#reverting changes
 /bin/rm $PATH2FILE/$FILE
-/bin/rm /etc/rsyncd.conf
 /bin/rm /var/log/$FILE
 
-t_ServiceControl xinetd restart
+if [ "$centos_ver" = "7" ] ; then
+ systemctl start rsyncd.service
+else
+ /bin/rm /etc/rsyncd.conf
+ t_ServiceControl xinetd restart
+fi