diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-11-28 16:10:22 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 15:22:08 +0100 |
| commit | b460fb1dd29b69917f934e267eff760040c34680 (patch) | |
| tree | 00741dab86bd45f9fc5527f14dbd9a31caae6b0d | |
| parent | 633bee03fcd05908eeff138a77a8970505579032 (diff) | |
| download | strongswan-b460fb1dd29b69917f934e267eff760040c34680.tar.bz2 strongswan-b460fb1dd29b69917f934e267eff760040c34680.tar.xz | |
Drop SHAREDTREE in favor of mounting the compile dir
| -rwxr-xr-x | testing/scripts/build-umlrootfs | 14 | ||||
| -rwxr-xr-x | testing/testing.conf | 5 |
2 files changed, 4 insertions, 15 deletions
diff --git a/testing/scripts/build-umlrootfs b/testing/scripts/build-umlrootfs index d3395c872..f321463db 100755 --- a/testing/scripts/build-umlrootfs +++ b/testing/scripts/build-umlrootfs @@ -60,16 +60,6 @@ mount -t proc none $LOOPDIR/proc >> $LOGFILE 2>&1 cgecho "done" ###################################################### -# setting up mountpoint for shared source tree -# -if [ "${SHAREDTREE+set}" = "set" ]; then - cecho " * setting up shared strongswan tree at '$SHAREDTREE'" - mkdir $LOOPDIR/root/strongswan-shared - echo "" >> $LOOPDIR/etc/fstab - echo "none /root/strongswan-shared hostfs $SHAREDTREE" >> $LOOPDIR/etc/fstab -fi - -###################################################### # install software from source using 'recipes' # mkdir -p $ROOTFSCOMPILEDIR @@ -95,6 +85,10 @@ done umount $LOOPDIR/root/compile +cecho " * Setting up shared build tree at /root/compile" +echo "" >> $LOOPDIR/etc/fstab +echo "none /root/compile hostfs $ROOTFSCOMPILEDIR" >> $LOOPDIR/etc/fstab + ###################################################### # remove /etc/resolv.conf # diff --git a/testing/testing.conf b/testing/testing.conf index 7a4998bd6..b7195bc8f 100755 --- a/testing/testing.conf +++ b/testing/testing.conf @@ -62,11 +62,6 @@ TESTRESULTSDIR=$UMLTESTDIR/testresults # SSH configuration (speedup SSH) SSHCONF="-F $UMLTESTDIR/testing/ssh_config" -# Path to a full strongswan tree on the host system, which is -# mounted into /root/strongswan-shared. This gives us an easy -# way to apply and test changes instantly. -#SHAREDTREE=/home/martin/strongswan/trunk - # Timezone for the UMLs, look in /usr/share/zoneinfo! TZUML="Europe/Zurich" |