--- trunk/mlivecdbuild/mlivecdbuild2.sh	2008/04/10 20:50:31	712
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2008/04/10 20:52:33	713
@@ -256,27 +256,6 @@
 	popd
 }
 
-generate_dvd()
-{
-	echo Generating DVD Image ...
-	install -d ${CDISOROOT}
-	pushd ${CDISOROOT} &&
-		growisofs -dvd-compat \
-			-rock \
-			-full-iso9660-filenames \
-			-allow-leading-dots \
-			-disable-deep-relocation \
-			-output ${LIVECDROOT}/${CDISONAME} \
-			-eltorito-boot isolinux/isolinux.bin \
-			-eltorito-catalog isolinux/boot.cat \
-			-no-emul-boot \
-			-boot-load-size 4 \
-			-boot-info-table \
-			-volid "${CDID}" \
-			${CDISOROOT} #&> /dev/null
-	popd
-}
-
 enter_livecd()
 {
 	mount -t sysfs sysfs ${CDCHROOTDIR}/sys
@@ -309,7 +288,6 @@
 	echo "    initrd     - generates a livecd suitable initrd"
 	echo "    bootloader - installs the bootloader"
 	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
@@ -328,19 +306,13 @@
 	initrd) generate_initrd;;
 	bootloader) install_bootloader;;
 	isogen) generate_iso;;
-	dvdgen) generate_dvd;;
 	all)
 		bootstrap_system
 		prepare_iso
 		generate_rootfs
 		generate_initrd
 		install_bootloader
-		if [[ ${DEFINE_DVD} = 1 ]]
-		then
-			generate_dvd
-		else
-			generate_iso
-		fi
+		generate_iso
 		;;
 	enter) enter_livecd ;;
 	*|'') usage;;