Diff of /branches/mlivecdbuild-1_x_branch/mlivecdbuild2.sh

Parent Directory | Revision Log | Patch

	revision 360 by niro, Mon Mar 27 21:23:02 2006 UTC	revision 609 by niro, Sun Nov 11 11:41:57 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 72  add_initrc()	Line 72  add_initrc()
72	local var="$1"	local var="$1"
73
74	# sanity checks	# sanity checks
75	[ -z "${CDCHROOTDIR}" ] && die "\$CDCHROOTDIR not given."	[[ -z ${CDCHROOTDIR} ]] && die "\$CDCHROOTDIR not given."
76	echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"	echo "${var}" >> ${CDCHROOTDIR}/.installrc || die "add_initrc() adding \$var"
77	}	}
78
#	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
90		# respect proxies
91		[[ -n ${http_proxy} ]] && add_initrc "export http_proxy=${http_proxy}"
92		[[ -n ${ftp_proxy} ]] && add_initrc "export ftp_proxy=${ftp_proxy}"
93		[[ -n ${no_proxy} ]] && add_initrc "export no_proxy=${no_proxy}"
94
95		# do not auto-start any services!
96		add_initrc "export MAGE_BOOTSTRAP=true"
97
98		local i
99		for i in ${packages}
100		do
101		add_initrc "mage ${cmd} ${i}"
102		done
103		add_initrc "mage clean"
104
105		# now run the .installrc script
106		mount -t proc proc ${CDCHROOTDIR}/proc || die "mount proc"
107		mount -t sysfs sysfs ${CDCHROOTDIR}/sys || die "mount sys"
108		mount -o bind /dev ${CDCHROOTDIR}/dev || die "mount dev"
109		chroot ${CDCHROOTDIR} /bin/bash -i /.installrc || die "chr00ting"
110		umount ${CDCHROOTDIR}/dev || die "umount dev"
111		umount ${CDCHROOTDIR}/proc || die "umount proc"
112		umount ${CDCHROOTDIR}/sys || die "umount sys"
113		[ -f ${CDCHROOTDIR}/.installrc ] && rm ${CDCHROOTDIR}/.installrc
114		fi
115		;;
116	*) die "custom_packages: unkown command ${cmd}";;	*) die "custom_packages: unkown command ${cmd}";;
117	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
118	}	}
119
120	read_config()	read_config()
#	Line 128  prepare_iso()	Line 136  prepare_iso()
136	echo Preparing LiveCD ISO Image ...	echo Preparing LiveCD ISO Image ...
137
138	# fixes some issues with xfree/xorg xkb	# fixes some issues with xfree/xorg xkb
139	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 ]]
140	then	then
141	rm ${CDCHROOTDIR}/etc/X11/xkb || die	rm ${CDCHROOTDIR}/etc/X11/xkb || die
142	mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die	mv ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb ${CDCHROOTDIR}/etc/X11 || die
#	Line 143  prepare_iso()	Line 151  prepare_iso()
151
152	echo Setting up services ...	echo Setting up services ...
153
	# 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"
154	# add hardware detection	# add hardware detection
155	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
156
#	Line 252  generate_iso()	Line 255  generate_iso()
255	popd	popd
256	}	}
257
258		generate_dvd()
259		{
260		echo Generating DVD Image ...
261		install -d ${CDISOROOT}
262		pushd ${CDISOROOT} &&
263		growisofs -dvd-compat \
264		-rock \
265		-full-iso9660-filenames \
266		-allow-leading-dots \
267		-disable-deep-relocation \
268		-output ${LIVECDROOT}/${CDISONAME} \
269		-eltorito-boot isolinux/isolinux.bin \
270		-eltorito-catalog isolinux/boot.cat \
271		-no-emul-boot \
272		-boot-load-size 4 \
273		-boot-info-table \
274		-volid "${CDID}" \
275		${CDISOROOT} #&> /dev/null
276		popd
277		}
278
279	enter_livecd()	enter_livecd()
280	{	{
281	mount -t sysfs sysfs ${CDCHROOTDIR}/proc	mount -t sysfs sysfs ${CDCHROOTDIR}/sys
282	mount -t proc proc ${CDCHROOTDIR}/proc	mount -t proc proc ${CDCHROOTDIR}/proc
283	mount -o bind /dev ${CDCHROOTDIR}/dev	mount -o bind /dev ${CDCHROOTDIR}/dev
284
#	Line 263  enter_livecd()	Line 287  enter_livecd()
287	HOME=/root \	HOME=/root \
288	TERM=$TERM PS1='\u:\w\$ ' \	TERM=$TERM PS1='\u:\w\$ ' \
289	PATH=/bin:/usr/bin:/sbin:/usr/sbin \	PATH=/bin:/usr/bin:/sbin:/usr/sbin \
290		http_proxy=${http_proxy} \
291		ftp_proxy=${ftp_proxy} \
292		no_proxy=${no_proxy} \
293	/bin/bash -i	/bin/bash -i
294
295		umount ${CDCHROOTDIR}/dev
296		umount ${CDCHROOTDIR}/proc
297		umount ${CDCHROOTDIR}/sys
298	}	}
299
300	usage()	usage()
#	Line 277  usage()	Line 308  usage()
308	echo "    initrd     - generates a livecd suitable initrd"	echo "    initrd     - generates a livecd suitable initrd"
309	echo "    bootloader - installs the bootloader"	echo "    bootloader - installs the bootloader"
310	echo "    isogen     - generate the final livecd iso image"	echo "    isogen     - generate the final livecd iso image"
311		echo "    dvdgen     - same as isogen but creates a dvd-image"
312	echo "    all        - runs all tasks to get a livecd from zero"	echo "    all        - runs all tasks to get a livecd from zero"
313		echo "    enter      - enters the rootfs of a livecd"
314	echo	echo
315	echo "    for example '$(basename $0) all default'"	echo "    for example '$(basename $0) all default'"
316	echo "    creates a livecd using the default profile."	echo "    creates a livecd using the default profile."
#	Line 287  usage()	Line 320  usage()
320	# source profile config - overrides all other vars	# source profile config - overrides all other vars
321	[ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config	[ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config
322
	#bootstrap_system
	#prepare_iso
	#generate_rootfs
	#generate_initrd
	#install_bootloader
	#generate_iso
323	case $1 in	case $1 in
324	bootstrap) bootstrap_system;;	bootstrap) bootstrap_system;;
325	prepare) prepare_iso;;	prepare) prepare_iso;;
#	Line 301  case $1 in	Line 327  case $1 in
327	initrd) generate_initrd;;	initrd) generate_initrd;;
328	bootloader) install_bootloader;;	bootloader) install_bootloader;;
329	isogen) generate_iso;;	isogen) generate_iso;;
330		dvdgen) generate_dvd;;
331	all)	all)
332	bootstrap_system	bootstrap_system
333	prepare_iso	prepare_iso
334	generate_rootfs	generate_rootfs
335	generate_initrd	generate_initrd
336	install_bootloader	install_bootloader
337	generate_iso	if [[ ${DEFINE_DVD} = 1 ]]
338		then
339		generate_dvd
340		else
341		generate_iso
342		fi
343	;;	;;
344		enter) enter_livecd ;;
345	*|'') usage;;	*|'') usage;;
346	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.609