--- startup-0.9.8.5.orig/rc.d/rc.sysinit	2006-08-16 06:08:24 +1300
+++ startup-0.9.8.5/rc.d/rc.sysinit	2006-08-22 00:08:12 +1300
@@ -85,9 +85,6 @@
 # Set the system clock (when /etc/adjtime is missing)
 [ -s /etc/adjtime ] || /etc/init.d/clock start
 
-# Activate swap
-action "Activating swap partitions:" swapon -a -e
-
 # Set the hostname
 action "Setting hostname $HOSTNAME:" hostname "$HOSTNAME"
 
@@ -315,7 +312,7 @@
 # Activate LVM
 VGSCAN=/sbin/vgscan
 VGCHANGE=/sbin/vgchange
-if [ -e "$VGCHANGE" -a -e "$VGSCAN" -a -s /etc/lvmtab ]; then
+if [ -e "$VGCHANGE" -a -e "$VGSCAN" ]; then
 	modprobe lvm-mod >/dev/null 2>&1
 	# for 2.4.x kernel and LVM1 binaris
 	if [ -d /proc/lvm -a ! -c /dev/mapper/control -a ! -x /sbin/lvm ]; then
@@ -329,6 +326,9 @@
 	fi
 fi
 
+# Activate swap
+action "Activating swap partitions:" swapon -a -e
+
 # Check filesystems
 splash_update localfs 5
 _RUN_QUOTACHECK=0