support of SQL databases in UML scenarios

This commit is contained in:
Andreas Steffen 2008-04-06 12:05:42 +00:00
parent a9184df36b
commit babaaa3c11
4 changed files with 26 additions and 9 deletions

View File

@ -53,7 +53,7 @@ are required for the strongSwan testing environment:
* A vanilla Linux kernel on which the UML kernel will be based on.
We recommend the use of
http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.2.tar.bz2
http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.24.4.tar.bz2
* Starting with Linux kernel 2.6.9 no patch must be applied any more in order
to make the vanilla kernel UML-capable. For older kernels you'll find
@ -71,7 +71,7 @@ are required for the strongSwan testing environment:
* The latest strongSwan distribution
http://download.strongswan.org/strongswan-4.1.11.tar.gz
http://download.strongswan.org/strongswan-4.2.0.tar.gz
3. Creating the environment

View File

@ -469,13 +469,20 @@ do
$TESTRESULTDIR/${host}.$file > /dev/null 2>&1
done
if [ $SUBDIR = "sql" ]
then
scp $HOSTLOGIN:/etc/ipsec.d/ipsec.sql \
$TESTRESULTDIR/${host}.ipsec.sql > /dev/null 2>&1
else
touch $TESTRESULTDIR/${host}.ipsec.sql
fi
ssh $HOSTLOGIN ip route list table $SOURCEIP_ROUTING_TABLE \
> $TESTRESULTDIR/${host}.iproute 2>/dev/null
ssh $HOSTLOGIN $IPTABLES -v -n -L \
> $TESTRESULTDIR/${host}.iptables 2>/dev/null
cat >> $TESTRESULTDIR/index.html <<@EOF
<h3>$host</h3>
<table border="0" cellspacing="0" width="400">
<table border="0" cellspacing="0" width="600">
<tr>
<td>
<ul>
@ -493,6 +500,11 @@ do
<li><a href="$host.iptables">$IPTABLES -L</a></li>
</ul>
</td>
<td valign="top">
<ul>
<li><a href="$host.ipsec.sql">ipsec.sql</a></li>
</ul>
</td>
</tr>
</table>
@EOF

View File

@ -129,7 +129,6 @@ echo "ln -sf /usr/share/zoneinfo/${TZUML} /etc/localtime" >> $INSTALLSHELL
echo "cd /root/${STRONGSWANVERSION}" >> $INSTALLSHELL
echo -n "./configure --sysconfdir=/etc" >> $INSTALLSHELL
echo -n " --with-random-device=/dev/urandom" >> $INSTALLSHELL
echo -n " --enable-integrity-test" >> $INSTALLSHELL
if [ "$USE_LIBCURL" = "yes" ]
then
@ -151,6 +150,11 @@ then
echo -n " --enable-eap-sim" >> $INSTALLSHELL
fi
if [ "$USE_SQL" = "yes" ]
then
echo -n " --enable-sql --enable-sqlite" >> $INSTALLSHELL
fi
if [ "$USE_MEDIATION" = "yes" ]
then
echo -n " --enable-mediation" >> $INSTALLSHELL

View File

@ -21,7 +21,7 @@ UMLTESTDIR=~/strongswan-testing
# Bzipped kernel sources
# (file extension .tar.bz2 required)
KERNEL=$UMLTESTDIR/linux-2.6.24.2.tar.bz2
KERNEL=$UMLTESTDIR/linux-2.6.24.4.tar.bz2
# Extract kernel version
KERNELVERSION=`basename $KERNEL .tar.bz2 | sed -e 's/linux-//'`
@ -34,12 +34,13 @@ KERNELCONFIG=$UMLTESTDIR/.config-2.6.24
#UMLPATCH=$UMLTESTDIR/uml_jmpbuf-2.6.18.patch.bz2
# Bzipped source of strongSwan
STRONGSWAN=$UMLTESTDIR/strongswan-4.2.0.tar.bz2
STRONGSWAN=$UMLTESTDIR/strongswan-4.2.1.tar.bz2
# strongSwan compile options (use "yes" or "no")
USE_LIBCURL="yes"
USE_LDAP="yes"
USE_EAP_AKA="yes"
USE_SQL="yes"
USE_MEDIATION="yes"
USE_INTEGRITY_TEST="no"
USE_LEAK_DETECTIVE="no"