github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-24 11:25:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #776 from justincormack/small-swap

Browse Source 
Do not create swap file if the disk is small
This commit is contained in:
Justin Cormack 2016-11-23 03:32:33 -08:00 committed by GitHub
commit 68e3178646
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
alpine/packages/automount/etc/init.d/automount
View File

@ -76,8 +76,11 @@ do_mkfs()
do_swapfile()
{
DRIVE=$1
SIZE=$(sfdisk -J "$DRIVE" | jq -e -r '.partitiontable.partitions | map(select(.type=="83")) | .[0].size')
SWAP=/var/spool/swap
if [ "$(mobyplatform)" = "mac" ] || [ "$(mobyplatform)" = "windows" ] && [ ! -f $SWAP ]
# Create swap on desktop platforms if disk size larger than 16GB
if [ "$(mobyplatform)" = "mac" -o "$(mobyplatform)" = "windows" ] && [ ! -f $SWAP ] && [ "$SIZE" -gt 33554432 ]
then
mkdir -p "$(dirname $SWAP)"
dd if=/dev/zero of=$SWAP bs=1k count=1048576
@ -130,7 +133,7 @@ start()
# Use existing swap partition of present; we do not create one now
SWAP=$(fdisk -l "$DRIVE" | grep 'Linux swap' | head -1 | awk '{print $1}')
[ -z "$SWAP" ] && do_swapfile || swapon "$SWAP"
[ -z "$SWAP" ] && do_swapfile "$DRIVE" || swapon "$SWAP"
# boot2docker compat, has /var and /tmp on partition
[ -d /var/var/lib/boot2docker/ ] && mount --bind /var/var /var