denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

testing: Build certificates before guests after building strongSwan

Browse Source 
If the script is run on a clean working copy, building the guests will
fail if the certificates don't exist.
This commit is contained in:
Tobias Brunner
2019-05-08 14:56:48 +02:00
parent 287149cbf9
commit d3f678c08f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-strongswan
+8 -2
View File
@@ -88,9 +88,15 @@ cp $RECPDIR/$RECIPE $SHAREDDIR/build-strongswan
log_action "Installing from recipe $RECIPE" log_action "Installing from recipe $RECIPE"
execute_chroot "make SRCDIR=/root/strongswan BUILDDIR=/root/shared/build-strongswan -f /root/shared/build-strongswan/$RECIPE" execute_chroot "make SRCDIR=/root/strongswan BUILDDIR=/root/shared/build-strongswan -f /root/shared/build-strongswan/$RECIPE"
# requild the guest images if we modified the root image # rebuild the guest images after we modified the root image
if [ -z "$2" ]; then if [ -z "$2" ]; then
# cleanup before mounting guest images # cleanup before mounting guest images
on_exit on_exit
$DIR/build-guestimages # building the guest images without certificates fails on winnetou
if [ ! -f "$DIR/../hosts/winnetou/etc/ca/strongswanCert.pem" ]; then
# this also re-builds the guest images
$DIR/build-certs
else
$DIR/build-guestimages
fi
fi fi