--- trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/19 17:09:17	472
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2007/11/11 11:41:57	609
@@ -72,7 +72,7 @@
 	local var="$1"
 
 	# sanity checks
-	[ -z "${CDCHROOTDIR}" ] && die "\$CDCHROOTDIR not given."
+	[[ -z ${CDCHROOTDIR} ]] && die "\$CDCHROOTDIR not given."
 	echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"
 }
 
@@ -92,10 +92,13 @@
 				[[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"
 				[[ -n ${no_proxy} ]] && add_initrc "export no_proxy=${no_proxy}"
 
+				# do not auto-start any services!
+				add_initrc "export MAGE_BOOTSTRAP=true"
+
 				local i
 				for i in ${packages}
 				do
-					add_initrc "mage install ${i}"
+					add_initrc "mage ${cmd} ${i}"
 				done
 				add_initrc "mage clean"
 		
@@ -133,7 +136,7 @@
 	echo Preparing LiveCD ISO Image ...
 
 	# fixes some issues with xfree/xorg xkb
-	if [ -L "${CDCHROOTDIR}/etc/X11/xkb" -a -d "/usr/X11R6/lib/X11/xkb" ]
+	if [[ -L ${CDCHROOTDIR}/etc/X11/xkb ]] && [[ -d /usr/X11R6/lib/X11/xkb ]]
 	then
 		rm ${CDCHROOTDIR}/etc/X11/xkb || die
 		mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die
@@ -275,7 +278,7 @@
 
 enter_livecd()
 {
-	mount -t sysfs sysfs ${CDCHROOTDIR}/proc
+	mount -t sysfs sysfs ${CDCHROOTDIR}/sys
 	mount -t proc proc ${CDCHROOTDIR}/proc
 	mount -o bind /dev ${CDCHROOTDIR}/dev
 
@@ -288,6 +291,10 @@
 			ftp_proxy=${ftp_proxy} \
 			no_proxy=${no_proxy} \
 		/bin/bash -i
+
+	umount ${CDCHROOTDIR}/dev
+	umount ${CDCHROOTDIR}/proc
+	umount ${CDCHROOTDIR}/sys
 }
 
 usage()