diff --git a/base/etc/one-context.d/04-mount-swap b/base/etc/one-context.d/04-mount-swap
index e42ca2e..06881e0 100755
--- a/base/etc/one-context.d/04-mount-swap
+++ b/base/etc/one-context.d/04-mount-swap
@@ -1 +1,15 @@
-swapon -L swap
+#!/bin/bash
+
+activate_swaps() {
+
+    SWAP_DRIVES=$(blkid | grep 'TYPE=\"swap\"' | cut -d':' -f1)
+    for SWAP in $SWAP_DRIVES ; do
+        if [ -z "$(swapon -s | grep $SWAP)"]; then
+            swapon $SWAP
+        fi
+    done
+    
+}
+
+activate_swaps
+