testing: Move collector.db in tnc/tnccs-20-ev-pt-tls scenario to /etc/db.d

Also move initialization to the pretest script (it's way faster in the
in-memory database).

testing/scripts/build-guestimages

@@ -50,10 +50,6 @@ do
 	execute_chroot "ldconfig" 0
 	execute "mkdir $LOOPDIR/etc/pts" 0
 
-	if [ "$host" = "carol" ]
-	then
-		execute_chroot "/usr/local/bin/init_collector" 0
-	fi
 	if [ "$host" = "alice" ]
 	then
 		execute "mkdir $LOOPDIR/var/log/apache2/tnc" 0

testing/scripts/build-strongswan

@@ -51,6 +51,7 @@ do_on_exit umount $LOOPDIR/root/strongswan
 
 log_action "Remove SWID tags of previous versions"
 execute_chroot 'find /usr/local/share/regid.2004-03.org.strongswan -name *.swidtag -delete'
+execute_chroot 'find /usr/local/share/strongswan -name *.swidtag -delete'
 
 echo "Building and installing strongSwan"