From 4d9ccadbbe8a4cb3051c1b512fd3c222e5117cc3 Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Nov 26 2011 11:17:56 +0000
Subject: Merge remote branch 'upstream/master'


---

diff --git a/tests/0_common/40_update_hosts.sh b/tests/0_common/40_update_hosts.sh
new file mode 100755
index 0000000..ad952b7
--- /dev/null
+++ b/tests/0_common/40_update_hosts.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+# Author: Athmane Madjoudj <athmanem@gmail.com>
+
+
+t_Log "Running $0 - Update /etc/hosts"
+
+echo "127.0.0.1   `hostname` localhost.localdomain" >> /etc/hosts
+
diff --git a/tests/p_logrotate/logrotate_test.sh b/tests/p_logrotate/logrotate_test.sh
index 774f827..c2004e0 100755
--- a/tests/p_logrotate/logrotate_test.sh
+++ b/tests/p_logrotate/logrotate_test.sh
@@ -3,6 +3,6 @@
 
 t_Log "Running $0 - logrotate test."
 
-/usr/sbin/logrotate -f /etc/logrotate.conf
+/usr/sbin/logrotate /etc/logrotate.conf
 
 t_CheckExitStatus $?
diff --git a/tests/p_nfs/0-install_nfs.sh b/tests/p_nfs/0-install_nfs.sh
index 58af79b..151a76a 100755
--- a/tests/p_nfs/0-install_nfs.sh
+++ b/tests/p_nfs/0-install_nfs.sh
@@ -5,6 +5,11 @@
 t_InstallPackage nfs-utils
 
 # Restart because usualy NFS is enabled by default on CentOS-5
-t_ServiceControl portmap restart
 t_ServiceControl nfs restart
 
+if (t_GetPkgRel basesystem | grep -q el6)
+then
+   t_ServiceControl rpcbind restart
+else
+   t_ServiceControl portmap restart
+fi