From e36e15b371ae51c0bbf38880d5e31fa2264afa37 Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 23 Jan 2017 16:20:10 +0000 Subject: [PATCH] Clean up swap partition mounting logic Signed-off-by: Justin Cormack --- alpine/packages/automount/etc/init.d/automount | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/alpine/packages/automount/etc/init.d/automount b/alpine/packages/automount/etc/init.d/automount index a6aa8b677..30f875ef4 100755 --- a/alpine/packages/automount/etc/init.d/automount +++ b/alpine/packages/automount/etc/init.d/automount @@ -142,8 +142,13 @@ start() fi # 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 "$DRIVE" || swapon "$SWAP" + SWAP_PART=$(fdisk -l "$DRIVE" | grep 'Linux swap' | head -1 | awk '{print $1}') + if [ -z "$SWAP_PART" ] + then + do_swapfile "$DRIVE" + else + swapon "$SWAP_PART" + fi # boot2docker compat, has /var and /tmp on partition [ -d /var/var/lib/boot2docker/ ] && (mv /var/var/* /var && rm -rf /var/var)