[Debian-live-changes] r1642 - in dists/trunk/live-initramfs: conf scripts/live-bottom

[daniel at alioth.debian.org]

Author: daniel
Date: 2007-05-23 14:22:56 +0000 (Wed, 23 May 2007)
New Revision: 1642

Modified:
   dists/trunk/live-initramfs/conf/live.conf
   dists/trunk/live-initramfs/scripts/live-bottom/13swap
Log:


Modified: dists/trunk/live-initramfs/conf/live.conf
===================================================================
--- dists/trunk/live-initramfs/conf/live.conf	2007-05-23 14:22:50 UTC (rev 1641)
+++ dists/trunk/live-initramfs/conf/live.conf	2007-05-23 14:22:56 UTC (rev 1642)
@@ -1,4 +1,4 @@
-# /etc/live.conf - configuration file for live-initramfs
+# /etc/live.conf - configuration file for live-initramfs(7)
 
 BUILD_SYSTEM="Debian"
 

Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-05-23 14:22:50 UTC (rev 1641)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-05-23 14:22:56 UTC (rev 1642)
@@ -20,6 +20,11 @@
 
 # live-initramfs header
 
+if [ -n "${NOSWAP}" ]
+then
+	exit 0
+fi
+
 . /scripts/live-functions
 
 log_begin_msg "Setting up swap..."
@@ -28,11 +33,6 @@
 
 FSTAB=/root/etc/fstab
 
-if [ -n "${NOSWAP}" ]
-then
-    exit 0
-fi
-
 devices=""
 for device in /dev/[hs]d[a-z][0-9]*; do
     if ! [ -b "$device" ]; then