--- trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/14 15:23:27	464
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/19 17:03:14	471
@@ -52,19 +52,19 @@
 	local services="$2"
 
 	case ${cmd} in
-		add|del|default) continue;;
+		add|del|default)
+			# add given services from profile
+			if [[ -n ${services} ]]
+			then
+				local i
+				for i in ${services}
+				do
+					MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
+				done
+			fi
+			;;
 		*) die "custom_services: unkown command ${cmd}";;
 	esac
-
-	# add given services from profile
-	if [[ -n ${services} ]]
-	then
-		local i
-		for i in ${services}
-		do
-			MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
-		done
-	fi
 }
 
 add_initrc()
@@ -82,31 +82,30 @@
 	local packages="$2"
 
 	case ${cmd} in
-		install|uninstall) continue;;
+		install|uninstall)
+			if [[ -n ${packages} ]]
+			then
+				:> ${CDCHROOTDIR}/.installrc
+				local i
+				for i in ${packages}
+				do
+					add_initrc "mage install ${i}"
+				done
+				add_initrc "mage clean"
+		
+				# now run the .installrc script
+				mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"
+				mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"
+				mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"
+				chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"
+				umount ${CDCHROOTDIR}/dev || die "umount dev"
+				umount ${CDCHROOTDIR}/proc || die "umount proc"
+				umount ${CDCHROOTDIR}/sys || die "umount sys"
+				[ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc
+			fi
+			;;
 		*) die "custom_packages: unkown command ${cmd}";;
 	esac
-
-	if [[ -n ${packages} ]]
-	then
-
-		:> ${CDCHROOTDIR}/.installrc
-		local i
-		for i in ${packages}
-		do
-			add_initrc "mage install ${i}"
-		done
-		add_initrc "mage clean"
-
-		# now run the .installrc script
-		mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"
-		mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"
-		mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"
-		chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"
-		umount ${CDCHROOTDIR}/dev || die "umount dev"
-		umount ${CDCHROOTDIR}/proc || die "umount proc"
-		umount ${CDCHROOTDIR}/sys || die "umount sys"
-		[ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc
-	fi
 }
 
 read_config()