github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-28 13:08:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1079 from justincormack/swapdiskname

Browse Source 
Clean up swap partition mounting logic
This commit is contained in:
Justin Cormack 2017-01-23 17:04:12 +00:00 committed by GitHub
commit 4278e0d78e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,8 +142,13 @@ start()
fi fi
# Use existing swap partition of present; we do not create one now # Use existing swap partition of present; we do not create one now
SWAP=$(fdisk -l "$DRIVE" | grep 'Linux swap' | head -1 | awk '{print $1}') SWAP_PART=$(fdisk -l "$DRIVE" | grep 'Linux swap' | head -1 | awk '{print $1}')
[ -z "$SWAP" ] && do_swapfile "$DRIVE" || swapon "$SWAP" if [ -z "$SWAP_PART" ]
then
do_swapfile "$DRIVE"
else
swapon "$SWAP_PART"
fi
# boot2docker compat, has /var and /tmp on partition # boot2docker compat, has /var and /tmp on partition
[ -d /var/var/lib/boot2docker/ ] && (mv /var/var/* /var && rm -rf /var/var) [ -d /var/var/lib/boot2docker/ ] && (mv /var/var/* /var && rm -rf /var/var)