--- trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/19 17:03:14	471
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2007/10/13 00:03:57	581
@@ -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"
 }
 
@@ -86,10 +86,19 @@
 			if [[ -n ${packages} ]]
 			then
 				:> ${CDCHROOTDIR}/.installrc
+
+				# respect proxies
+				[[ -n ${http_proxy} ]] && add_initrc "export http_proxy=${http_proxy}"
+				[[ -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"
 		
@@ -127,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
@@ -278,6 +287,9 @@
 			HOME=/root \
 			TERM=$TERM PS1='\u:\w\$ ' \
 			PATH=/bin:/usr/bin:/sbin:/usr/sbin \
+			http_proxy=${http_proxy} \
+			ftp_proxy=${ftp_proxy} \
+			no_proxy=${no_proxy} \
 		/bin/bash -i
 }
 
@@ -294,6 +306,7 @@
 	echo "    isogen     - generate the final livecd iso image"
 	echo "    dvdgen     - same as isogen but creates a dvd-image"
 	echo "    all        - runs all tasks to get a livecd from zero"
+	echo "    enter      - enters the rootfs of a livecd"
 	echo
 	echo "    for example '$(basename $0) all default'"
 	echo "    creates a livecd using the default profile."
@@ -324,5 +337,6 @@
 			generate_iso
 		fi
 		;;
+	enter) enter_livecd ;;
 	*|'') usage;;
 esac