Make sure we do not create a swap file if /var not mounted

See #875

This will only happen if there has been some sort of error
before, but lets not make it worse.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack 2016-12-13 09:49:13 -08:00
parent 73c1134f99
commit 8575ea050c

View File

@ -83,8 +83,11 @@ do_swapfile()
DRIVE=$1
SIZE=$(sfdisk -J "$DRIVE" | jq -e -r '.partitiontable.partitions | map(select(.type=="83")) | .[0].size')
SWAP=/var/spool/swap
MOUNT=$(mount | grep 'on /var type')
# Create swap on desktop platforms if disk size larger than 16GB
if [ "$(mobyplatform)" = "mac" -o "$(mobyplatform)" = "windows" ] && [ ! -f $SWAP ] && [ "$SIZE" -gt 33554432 ]
if [ "$(mobyplatform)" = "mac" -o "$(mobyplatform)" = "windows" ] && \
[ ! -f $SWAP ] && [ "$SIZE" -gt 33554432 ] && \
[ -n "$MOUNT" ]
then
mkdir -p "$(dirname $SWAP)"
dd if=/dev/zero of=$SWAP bs=1k count=1048576