--- trunk/mlivecdbuild/mlivecdbuild2.sh	2011/06/05 02:31:52	1402
+++ trunk/mlivecdbuild/mlivecdbuild2.sh	2011/06/05 18:27:47	1403
@@ -58,6 +58,7 @@
 {
 	local cmd="$1"
 	local services="$2"
+	local systemdcmd
 
 	case ${cmd} in
 		add|del|default)
@@ -67,7 +68,19 @@
 				local i
 				for i in ${services}
 				do
-					MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
+					# systemd
+					if [[ -x ${CDCHROOTDIR}/sbin/systemctl ]]
+					then
+						case ${cmd} in
+							add) chroot ${CDCHROOTDIR} systemctl enable ${i} ;;
+							del) chroot ${CDCHROOTDIR} systemctl disable ${i} ;;
+						esac
+					fi
+					# busybox and sysvinit
+					if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
+					then
+						MROOT="${CDCHROOTDIR}" rc-config ${cmd} ${i} || die "rc ${cmd} ${i}"
+					fi
 				done
 			fi
 			;;
@@ -152,7 +165,11 @@
 		ln -s ../../../../etc/X11/xkb ${CDCHROOTDIR}/usr/X11R6/lib/X11/xkb || die
 	fi
 
-	install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die
+	# only on sysvinit or busybox systems
+	if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
+	then
+		install -m 0644 $(get_profile inittab) ${CDCHROOTDIR}/etc/inittab || die
+	fi
 	install -m 0644 $(get_profile fstab) ${CDCHROOTDIR}/etc/fstab || die
 	install -m 0644 $(get_profile motd) ${CDCHROOTDIR}/etc/motd || die
 	install -m 0644 $(get_profile issue) ${CDCHROOTDIR}/etc/issue || die
@@ -162,10 +179,16 @@
 	echo Setting up services ...
 
 #	# add hardware detection
-#	MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
+#	if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
+#	then
+#		MROOT="${CDCHROOTDIR}" rc-config add hwdetect || die "rc add hwdetect"
+#	fi
 
 	# del checkfs
-	MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
+	if [[ -x ${CDCHROOTDIR}/sbin/rc-config ]]
+	then
+		MROOT="${CDCHROOTDIR}" rc-config del checkfs || die "rc del checkfs"
+	fi
 
 	# add custom packages
 	[[ -n ${ADD_PACKAGES} ]] && custom_packages install "${ADD_PACKAGES}"
@@ -193,18 +216,88 @@
 	fi
 
 	echo Cleaning unwanted files ...
-	:> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"
+	# do this only if not a symlink!
+	if [[ ! -L ${CDCHROOTDIR}/etc/mtab ]]
+	then
+		:> ${CDCHROOTDIR}/etc/mtab || die "whiping /etc/mtab"
+	fi
 	[ -f ${CDCHROOTDIR}/root/.bash_history ] && rm ${CDCHROOTDIR}/root/.bash_history
 }
 
 generate_rootfs()
 {
+	local loopdev
+	local size
+
+	if [ -f ${LIVECDROOT}/loop/LiveOS/ext3fs.img ]
+	then
+		rm ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
+	fi
+	if [ -f ${CDISOROOT}/LiveOS/squashfs.img ]
+	then
+		rm ${CDISOROOT}/LiveOS/squashfs.img
+	fi
+	if [ -f ${CDISOROOT}/livecdrootfs.sqsh ]
+	then
+		rm ${CDISOROOT}/livecdrootfs.sqsh
+	fi
+
 	echo Generating squashfs compressed rootfs loopfile ...
-	mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh #>/dev/null 2>&1
+	if [[ -x ${CDCHROOTDIR}/sbin/dracut ]]
+	then
+		install -d ${LIVECDROOT}/loop/{LiveOS,mnt} || die
+
+		# get the actual size of the chroot
+		size=$(du -s chroot | sed 's:^\(.*\)[[:space:]].*:\1:')
+
+		# generate a ext3fs file for devicemapper
+		dd if=/dev/zero of=${LIVECDROOT}/loop/LiveOS/ext3fs.img bs=1024 count=$(( ${size} + 10 )) || die
+		# create a filesystem
+		mkfs.ext3 -L "_${CDID}_EXT3" -m 1 -b 1024 -F ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
+		# set mount_counts and check_intervals to 0
+		# set dir_index top, to speed up thing with hashed b-trees
+		# allow acls too
+		tune2fs -c0 -i0 -Odir_index -ouser_xattr,acl ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
+
+		# losetup the device
+		loopdev=$(losetup -f)
+		[[ -z ${loopdev} ]] && die "No unused loopdev found. Maybe you want 'modprobe loop'?"
+
+		# mount the image
+		losetup ${loopdev} ${LIVECDROOT}/loop/LiveOS/ext3fs.img || die
+		mount ${loopdev} ${LIVECDROOT}/loop/mnt || die
+
+		# copy everything to the image file and preserve permissions
+		( cd ${CDCHROOTDIR} && tar cpf - . ) | ( cd ${LIVECDROOT}/loop/mnt && tar xvpf - )
+
+		# now umount everything and create the squashfs image
+		umount ${LIVECDROOT}/loop/mnt || die
+		losetup -d ${loopdev} || die
+		# remove mount to not ending up in the squashfs image
+		if [[ -d ${LIVECDROOT}/loop/mnt ]]
+		then
+			rm -r ${LIVECDROOT}/loop/mnt || die
+		fi
+		mksquashfs ${LIVECDROOT}/loop ${LIVECDROOT}/livecdrootfs.sqsh || die
+
+		# final cleanup
+		if [[ -d ${LIVECDROOT}/loop ]]
+		then
+			rm -r ${LIVECDROOT}/loop || die
+		fi
+	else
+		mksquashfs ${CDCHROOTDIR} ${LIVECDROOT}/livecdrootfs.sqsh || die
+	fi
 
 	echo Moving rootfs loopfile to isoroot ...
 	install -d ${CDISOROOT}
-	mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}
+	if [[ -x ${CDCHROOTDIR}/sbin/dracut ]]
+	then
+		install -d ${CDISOROOT}/LiveOS
+		mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}/LiveOS/squashfs.img
+	else
+		mv ${LIVECDROOT}/livecdrootfs.sqsh ${CDISOROOT}
+	fi
 }
 
 install_bootloader()
@@ -231,15 +324,30 @@
 {
 	local CHROOTSH="$(mktemp -p ${CDCHROOTDIR})"
 
+	is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
+	is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
+	is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
+
 	echo Generating initrd image ...
 	echo '#!/bin/bash' > ${CHROOTSH} || die
+	echo 'export LC_ALL=C' >> ${CHROOTSH} || die
 	echo 'kv="$(readlink /boot/vmlinuz)"' >> ${CHROOTSH} || die
 	echo 'kv="${kv/kernel-}/"' >> ${CHROOTSH} || die
-	echo 'mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die
+	# prefer dracut
+	echo 'if [[ -x /sbin/dracut ]]' >> ${CHROOTSH} || die
+	echo 'then' >> ${CHROOTSH} || die
+	echo '	dracut -v -f /initrd.gz ${kv}' >> ${CHROOTSH} || die
+	echo 'else' >> ${CHROOTSH} || die
+	echo '	mkinitrd-livecd -f --initramfs /initrd.gz ${kv}' >> ${CHROOTSH} || die
+	echo 'fi' >> ${CHROOTSH} || die
 	chmod +x ${CHROOTSH} || die
 	chroot ${CDCHROOTDIR} /$(basename ${CHROOTSH}) || die
 	[[ -f ${CHROOTSH} ]] && rm ${CHROOTSH} || die
 
+	is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
+	is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
+	is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
+
 	# move initrd to isoroot
 	install -d ${CDISOROOT}/isolinux || die
 	mv ${CDCHROOTDIR}/initrd.gz ${CDISOROOT}/isolinux || die
@@ -267,9 +375,9 @@
 
 enter_livecd()
 {
-	mount -t sysfs sysfs ${CDCHROOTDIR}/sys
-	mount -t proc proc ${CDCHROOTDIR}/proc
-	mount -o bind /dev ${CDCHROOTDIR}/dev
+	is_loc_mounted "${CDCHROOTDIR}/sys" || mount -t sysfs sysfs ${CDCHROOTDIR}/sys
+	is_loc_mounted "${CDCHROOTDIR}/proc" || mount -t proc proc ${CDCHROOTDIR}/proc
+	is_loc_mounted "${CDCHROOTDIR}/dev" || mount -o bind /dev ${CDCHROOTDIR}/dev
 
 	chroot ${CDCHROOTDIR} \
 		/usr/bin/env -i \
@@ -281,9 +389,28 @@
 			no_proxy=${no_proxy} \
 		/bin/bash -i
 
-	umount ${CDCHROOTDIR}/dev
-	umount ${CDCHROOTDIR}/proc
-	umount ${CDCHROOTDIR}/sys
+	is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
+	is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
+	is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
+}
+
+is_loc_mounted()
+{
+	local filesys
+	local i
+	filesys=$1
+
+	i="$(cat /proc/mounts | grep " ${filesys} " | cut -d ' ' -f2)"
+	[[ ${i} != ${filesys} ]] && return 1
+
+	return 0
+}
+
+trap_exit()
+{
+	is_loc_mounted "${CDCHROOTDIR}/dev" && umount ${CDCHROOTDIR}/dev
+	is_loc_mounted "${CDCHROOTDIR}/proc" && umount ${CDCHROOTDIR}/proc
+	is_loc_mounted "${CDCHROOTDIR}/sys" && umount ${CDCHROOTDIR}/sys
 }
 
 usage()
@@ -305,6 +432,9 @@
 	echo
 }
 
+# set some proper traps
+trap "trap_exit" SIGINT SIGQUIT
+
 # source profile config - overrides all other vars
 [ -f ${PROFILES_DIR}/${CDPROFILE}/config ] && . ${PROFILES_DIR}/${CDPROFILE}/config