From 3dd734aa02772cb1fbd4cdf152fcecc51abd4b11 Mon Sep 17 00:00:00 2001 From: Christoph Galuschka Date: Dec 21 2013 12:23:19 +0000 Subject: moved installation of freeradius-utils to installation script --- diff --git a/tests/p_freeradius/0-install_freeradius.sh b/tests/p_freeradius/0-install_freeradius.sh index 2691b09..b8ff190 100755 --- a/tests/p_freeradius/0-install_freeradius.sh +++ b/tests/p_freeradius/0-install_freeradius.sh @@ -10,10 +10,10 @@ t_Log "Running $0 - installation and startup of freeradius." if (t_GetPkgRel basesystem | grep -q el6) then #Install Freeradius (V2) - t_InstallPackage freeradius + t_InstallPackage freeradius freeradius-utils else #Install Freeradius2 - t_InstallPackage freeradius2 + t_InstallPackage freeradius2 freeradius2-utils fi # start daemon with default settings @@ -48,4 +48,3 @@ authenticate { EOF fi -# t_ServiceControl radiusd start diff --git a/tests/p_freeradius/radiusd_test.sh b/tests/p_freeradius/radiusd_test.sh index 703abac..f049616 100755 --- a/tests/p_freeradius/radiusd_test.sh +++ b/tests/p_freeradius/radiusd_test.sh @@ -4,13 +4,6 @@ t_Log "Running $0 - freeradius-access test" -if (t_GetPkgRel basesystem | grep -q el6) - then - t_InstallPackage freeradius-utils -else - t_InstallPackage freeradius2-utils -fi - # Make Backup of /etc/raddb/users and add testuser steve /bin/cp /etc/raddb/users /etc/raddb/users.orig echo 'steve Cleartext-Password := "centos"' >> /etc/raddb/users