[Debian-live-changes] r1472 - dists/trunk/live-initramfs/scripts/live-bottom

[Daniel Baumann]

Author: daniel
Date: 2007-05-11 19:36:56 +0000 (Fri, 11 May 2007)
New Revision: 1472

Modified:
   dists/trunk/live-initramfs/scripts/live-bottom/13swap
   dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
   dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
Log:


Modified: dists/trunk/live-initramfs/scripts/live-bottom/13swap
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-05-11 19:28:19 UTC (rev 1471)
+++ dists/trunk/live-initramfs/scripts/live-bottom/13swap	2007-05-11 19:36:56 UTC (rev 1472)
@@ -2,11 +2,6 @@
 
 set -e
 
-if [ -z "${SWAPOFF}" ]
-then
-	exit 0
-fi
-
 # initramfs-tools header
 
 PREREQ=""
@@ -25,6 +20,11 @@
 
 # live-initramfs header
 
+if [ -z "${SWAPOFF}" ]
+then
+	exit 0
+fi
+
 FSTAB=/root/etc/fstab
 
 . /scripts/live-functions

Modified: dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode	2007-05-11 19:28:19 UTC (rev 1471)
+++ dists/trunk/live-initramfs/scripts/live-bottom/19xvideomode	2007-05-11 19:36:56 UTC (rev 1472)
@@ -29,7 +29,7 @@
 	mount -n -o bind /sys /root/sys
 	mount -n -o bind /proc /root/proc
 	mount -n -o bind /dev /root/dev
-	mount -n -o bind /etc /root/dev
+	mount -n -o bind /etc /root/etc
 
 chroot /root debconf-communicate -fnoninteractive live-initramfs > /dev/null << EOF
 set xserver-xorg/config/monitor/mode-list ${XVIDEOMODE}
@@ -41,6 +41,7 @@
 	umount /root/sys
 	umount /root/proc
 	umount /root/dev
+	umount /root/etc
 
 	log_end_msg
 fi

Modified: dists/trunk/live-initramfs/scripts/live-bottom/20xconfig
===================================================================
--- dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-05-11 19:28:19 UTC (rev 1471)
+++ dists/trunk/live-initramfs/scripts/live-bottom/20xconfig	2007-05-11 19:36:56 UTC (rev 1472)
@@ -20,12 +20,6 @@
 
 # xorg
 
-DESCRIPTION="Configuring X..."
-
-. /scripts/live-functions
-
-log_begin_msg "$DESCRIPTION"
-
 if [ "$TERM_TYPE" = "serial" ]
 then
 	# Don't bother trying to configure or start X on a serial console
@@ -33,6 +27,12 @@
 	exit 0
 fi
 
+DESCRIPTION="Configuring X..."
+
+. /scripts/live-functions
+
+log_begin_msg "$DESCRIPTION"
+
 mount -n -o bind /sys /root/sys
 mount -n -o bind /proc /root/proc
 mount -n -o bind /dev /root/dev