Diff of /trunk/mlivecdbuild/mlivecdbuild2.sh

Parent Directory | Revision Log | Patch

	revision 360 by niro, Mon Mar 27 21:23:02 2006 UTC	revision 471 by niro, Thu Apr 19 17:03:14 2007 UTC
#	Line 52  custom_services()	Line 52  custom_services()
52	local services="$2"	local services="$2"
53
54	case ${cmd} in	case ${cmd} in
55	add|del|default) continue;;	add|del|default)
56		# add given services from profile
57		if [[ -n ${services} ]]
58		then
59		local i
60		for i in ${services}
61		do
62		MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
63		done
64		fi
65		;;
66	*) die "custom_services: unkown command ${cmd}";;	*) die "custom_services: unkown command ${cmd}";;
67	esac	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
68	}	}
69
70	add_initrc()	add_initrc()
#	Line 82  custom_packages()	Line 82  custom_packages()
82	local packages="$2"	local packages="$2"
83
84	case ${cmd} in	case ${cmd} in
85	install|uninstall) continue;;	install|uninstall)
86		if [[ -n ${packages} ]]
87		then
88		:> ${CDCHROOTDIR}/.installrc
89		local i
90		for i in ${packages}
91		do
92		add_initrc "mage install ${i}"
93		done
94		add_initrc "mage clean"
95
96		# now run the .installrc script
97		mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"
98		mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"
99		mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"
100		chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"
101		umount ${CDCHROOTDIR}/dev || die "umount dev"
102		umount ${CDCHROOTDIR}/proc || die "umount proc"
103		umount ${CDCHROOTDIR}/sys || die "umount sys"
104		[ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc
105		fi
106		;;
107	*) die "custom_packages: unkown command ${cmd}";;	*) die "custom_packages: unkown command ${cmd}";;
108	esac	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
109	}	}
110
111	read_config()	read_config()
#	Line 143  prepare_iso()	Line 142  prepare_iso()
142
143	echo Setting up services ...	echo Setting up services ...
144
	# 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"
145	# add hardware detection	# add hardware detection
146	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
147
#	Line 252  generate_iso()	Line 246  generate_iso()
246	popd	popd
247	}	}
248
249		generate_dvd()
250		{
251		echo Generating DVD Image ...
252		install -d ${CDISOROOT}
253		pushd ${CDISOROOT} &&
254		growisofs -dvd-compat \
255		-rock \
256		-full-iso9660-filenames \
257		-allow-leading-dots \
258		-disable-deep-relocation \
259		-output ${LIVECDROOT}/${CDISONAME} \
260		-eltorito-boot isolinux/isolinux.bin \
261		-eltorito-catalog isolinux/boot.cat \
262		-no-emul-boot \
263		-boot-load-size 4 \
264		-boot-info-table \
265		-volid "${CDID}" \
266		${CDISOROOT} #&> /dev/null
267		popd
268		}
269
270	enter_livecd()	enter_livecd()
271	{	{
272	mount -t sysfs sysfs ${CDCHROOTDIR}/proc	mount -t sysfs sysfs ${CDCHROOTDIR}/proc
#	Line 277  usage()	Line 292  usage()
292	echo "    initrd     - generates a livecd suitable initrd"	echo "    initrd     - generates a livecd suitable initrd"
293	echo "    bootloader - installs the bootloader"	echo "    bootloader - installs the bootloader"
294	echo "    isogen     - generate the final livecd iso image"	echo "    isogen     - generate the final livecd iso image"
295		echo "    dvdgen     - same as isogen but creates a dvd-image"
296	echo "    all        - runs all tasks to get a livecd from zero"	echo "    all        - runs all tasks to get a livecd from zero"
297	echo	echo
298	echo "    for example '$(basename $0) all default'"	echo "    for example '$(basename $0) all default'"
#	Line 287  usage()	Line 303  usage()
303	# source profile config - overrides all other vars	# source profile config - overrides all other vars
304	[ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config	[ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
305
	#bootstrap_system
	#prepare_iso
	#generate_rootfs
	#generate_initrd
	#install_bootloader
	#generate_iso
306	case $1 in	case $1 in
307	bootstrap) bootstrap_system;;	bootstrap) bootstrap_system;;
308	prepare) prepare_iso;;	prepare) prepare_iso;;
#	Line 301  case $1 in	Line 310  case $1 in
310	initrd) generate_initrd;;	initrd) generate_initrd;;
311	bootloader) install_bootloader;;	bootloader) install_bootloader;;
312	isogen) generate_iso;;	isogen) generate_iso;;
313		dvdgen) generate_dvd;;
314	all)	all)
315	bootstrap_system	bootstrap_system
316	prepare_iso	prepare_iso
317	generate_rootfs	generate_rootfs
318	generate_initrd	generate_initrd
319	install_bootloader	install_bootloader
320	generate_iso	if [[ ${DEFINE_DVD} = 1 ]]
321		then
322		generate_dvd
323		else
324		generate_iso
325		fi
326	;;	;;
327	*|'') usage;;	*|'') usage;;
328	esac	esac

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.360   changed lines   Added in v.471