Drop SHAREDTREE in favor of mounting the compile dir
This commit is contained in:
@@ -59,16 +59,6 @@ mount -o loop $BASE $LOOPDIR >> $LOGFILE 2>&1
|
|||||||
mount -t proc none $LOOPDIR/proc >> $LOGFILE 2>&1
|
mount -t proc none $LOOPDIR/proc >> $LOGFILE 2>&1
|
||||||
cgecho "done"
|
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'
|
# install software from source using 'recipes'
|
||||||
#
|
#
|
||||||
@@ -95,6 +85,10 @@ done
|
|||||||
|
|
||||||
umount $LOOPDIR/root/compile
|
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
|
# remove /etc/resolv.conf
|
||||||
#
|
#
|
||||||
|
|||||||
@@ -62,11 +62,6 @@ TESTRESULTSDIR=$UMLTESTDIR/testresults
|
|||||||
# SSH configuration (speedup SSH)
|
# SSH configuration (speedup SSH)
|
||||||
SSHCONF="-F $UMLTESTDIR/testing/ssh_config"
|
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!
|
# Timezone for the UMLs, look in /usr/share/zoneinfo!
|
||||||
TZUML="Europe/Zurich"
|
TZUML="Europe/Zurich"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user