--- trunk/mlivecdbuild/mlivecdbuild2.sh	2006/03/27 21:23:02	360
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2007/04/14 15:23:27	464
@@ -143,11 +143,6 @@
 
 	echo Setting up services ...
 
-#	not needed with initscripts 0.3.6-r2
-#	# change mountfs with mountfslivecd
-#	MROOT="${CDCHROOTDIR}" rc-config del mountfs || die "rc del mountfs"
-#	MROOT="${CDCHROOTDIR}" rc-config add mountfslivecd || die "rc add mountfslivecd"
-
 	# add hardware detection
 	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
 
@@ -252,6 +247,27 @@
 	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}/proc
@@ -277,6 +293,7 @@
 	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
 	echo "    for example '$(basename $0) all default'"
@@ -287,13 +304,6 @@
 # source profile config - overrides all other vars
 [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
 
-#bootstrap_system
-#prepare_iso
-#generate_rootfs
-#generate_initrd
-#install_bootloader
-#generate_iso
-
 case $1 in
 	bootstrap) bootstrap_system;;
 	prepare) prepare_iso;;
@@ -301,13 +311,19 @@
 	initrd) generate_initrd;;
 	bootloader) install_bootloader;;
 	isogen) generate_iso;;
+	dvdgen) generate_dvd;;
 	all)
 		bootstrap_system
 		prepare_iso
 		generate_rootfs
 		generate_initrd
 		install_bootloader
-		generate_iso
+		if [[ ${DEFINE_DVD} = 1 ]]
+		then
+			generate_dvd
+		else
+			generate_iso
+		fi
 		;;
 	*|'') usage;;
 esac