?mode=patch&uid=2010032410350215402

Open Patch: 2010032410350215402 (by stf)

+ stf

Journal: Some updates and cross-compile fixes (discarded)

Journal: stf's update journal 2010-06-19 rev. 8

Votecheck 'unmatched': Missing 1 qualified vote(s) (clifford, fake, teha)

package/target-finish/2nd-stage-livecd/2nd-stage-livecd.conf

Stefan Fiedler:
	2nd-stage-livecd: add support for cdrkit

[Patch History / Archive]

Stefan Fiedler:
	2nd-stage-livecd: add support for cdrkit

--- package/target-finish/2nd-stage-livecd/2nd-stage-livecd.conf	(Revision 25)
+++ package/target-finish/2nd-stage-livecd/2nd-stage-livecd.conf	(Revision 26)
@@ -52,6 +52,17 @@
 		false
 	fi
 
+	MKISOFS=""
+	if [ -x "$( which genisoimage )" ] ; then
+		MKISOFS=genisoimage
+	elif [ -x "$( which mkisofs )" ] ; then
+		MKISOFS=mkisofs
+	fi
+	if [ "$MKISOFS" == "" ] ; then
+		echo "Neither genisoimage nor mkisofs found, aborting..."
+		false
+	fi
+
 	create_livecd=1
 	create_overlay=1
 
@@ -59,7 +70,8 @@
 		#
 		echo "Creating 2nd stage filesystem:"
 		# Unmount lingering dev and proc mounts from postinstall run, if any.
-		umount -l $disksdir/2nd_stage-livecd/{dev,proc} || true
+		mount
+		umount -n -l $disksdir/2nd_stage-livecd/{dev,proc} || true
 
 		rm -rf $disksdir/2nd_stage-livecd
 		mkdir -p $disksdir/2nd_stage-livecd
@@ -100,6 +112,7 @@
 			ldconfig -r .
 			#
 			echo "Running depmod for target system ..."
+			echo depmod -b $PWD -F boot/System.map $kernelversion					
 			depmod -b $PWD -F boot/System.map $kernelversion
 			echo "Running mkfontscale/mkfontdir and fc-cache ..."
 			for dir in usr/X11R7/lib/X11/fonts/* ; do
@@ -115,12 +128,12 @@
 		cd $disksdir
 		mkdir -p isofs-livecd
 		if [ "$image_type" = "isofs" ] ; then
-			mkisofs -R -o isofs-livecd/2nd_stage-livecd.img 2nd_stage-livecd
+			${MKISOFS} -R -o isofs-livecd/2nd_stage-livecd.img 2nd_stage-livecd
 		fi
 		if [ "$image_type" = "zisofs" ] ; then
 			rm -rf 2nd_stage-livecd-compressed
 			mkzftree 2nd_stage-livecd 2nd_stage-livecd-compressed
-			mkisofs -z -R -o isofs-livecd/2nd_stage-livecd.img \
+			${MKISOFS} -z -R -o isofs-livecd/2nd_stage-livecd.img \
 				2nd_stage-livecd-compressed
 		fi
 	fi
@@ -188,14 +201,14 @@
 		echo "Creating 2nd_stage-livecd.img image... (this takes some time)... "
 		cd $disksdir
 		mkdir -p isofs-livecd
-		mkisofs -R -o isofs-livecd/2nd_stage-overlay.img 2nd_stage-overlay
+		${MKISOFS} -R -o isofs-livecd/2nd_stage-overlay.img 2nd_stage-overlay
 		if [ "$image_type" = "isofs" ] ; then
-			mkisofs -R -o isofs-livecd/2nd_stage-overlay.img 2nd_stage-overlay
+			${MKISOFS} -R -o isofs-livecd/2nd_stage-overlay.img 2nd_stage-overlay
 		fi
 		if [ "$image_type" = "zisofs" ] ; then
 			rm -rf 2nd_stage-overlay-compressed
 			mkzftree 2nd_stage-overlay 2nd_stage-overlay-compressed
-			mkisofs -z -R -o isofs-livecd/2nd_stage-overlay.img \
+			${MKISOFS} -z -R -o isofs-livecd/2nd_stage-overlay.img \
 				2nd_stage-overlay-compressed
 		fi
 		# 

[Download this patch]