From 15d51a1927f9b25055e58cc200fa708fe1c14f40 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <katzj@redhat.com>
Date: Thu, 16 Oct 2008 22:08:41 -0400
Subject: [PATCH] Fix enabling of swap from LiveOS/swap.img

The previous check required there to be a swap partition in addition
to the existence of LiveOS/swap.img
---
 fedora-live-base.ks | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 0bb823c..3d821f7 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -122,9 +122,9 @@ if ! strstr "\`cat /proc/cmdline\`" noswap && [ -n "\$swaps" ] ; then
   for s in \$swaps ; do
     action "Enabling swap partition \$s" swapon \$s
   done
-  if [ -f /mnt/live/LiveOS/swap.img ]; then
-    action "Enabling swap file" swapon /mnt/live/LiveOS/swap.img
-  fi
+fi
+if ! strstr "\`cat /proc/cmdline\`" noswap && [ -f /mnt/live/LiveOS/swap.img ] ; then
+  action "Enabling swap file" swapon /mnt/live/LiveOS/swap.img
 fi
 
 mountPersistentHome() {