--- trunk/mkinitrd-magellan/livecd/mkinitrd-livecd.in	2008/01/14 19:32:52	663
+++ trunk/mkinitrd-magellan/livecd/mkinitrd-livecd.in	2008/01/14 19:35:02	664
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd-magellan/livecd/mkinitrd-livecd.in,v 1.1 2007-09-02 00:40:22 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd-magellan/livecd/mkinitrd-livecd.in,v 1.2 2008-01-14 19:35:02 niro Exp $
 
 # mkinitrd-livecd
 #
@@ -47,6 +47,7 @@
 MODULES_SCSI="${LIBDIR}/mkinitrd/modules.scsi"
 MODULES_SATA="${LIBDIR}/mkinitrd/modules.sata"
 MODULES_PATA="${LIBDIR}/mkinitrd/modules.pata"
+MODULES_FRAMEBUFFER="${LIBDIR}/mkinitrd/modules.framebuffer"
 MAKEDEV="${LIBDIR}/mkinitrd/MAKEDEV.sh"
 
 compress=1
@@ -76,6 +77,7 @@
 {
 	echo "usage: $(basename $0) [--version] [--help] [-v] [-f]"
 	echo "       [--image-version] [--no-strip] [--nocompress]"
+	echo "       [--linuxrc /path/to/custom/linuxrc ]"
 	echo "        <initrd-image> <kernel-version>"
 	echo
 	echo "       (ex: $(basename $0) /boot/initrd-2.2.5-15.img 2.2.5-15)"
@@ -211,6 +213,9 @@
 	local list="$1"
 	local module
 
+	# no list found; return
+	[[ -z ${list} ]] && return
+
 	while read module args
 	do
 		case "${module}" in
@@ -267,6 +272,7 @@
 		--initramfs) IMAGE_TYPE=initramfs ;;
 		--loopback) IMAGE_TYPE=loopback ;;
 		--no-strip) NOSTRIP=true ;;
+		--linuxrc) shift; LINUXRC="$1" ;;
 		*)
 			if [ -z "${target}" ]
 			then
@@ -283,6 +289,14 @@
 	shift
 done
 
+# no kernel or target given
+if [[ -z ${target} ]] || [[ -z ${kernel} ]]
+then
+	usage
+fi
+
+# die if linuxrc does not exist
+[[ ! -e ${LINUXRC} ]] && die "linuxrc '${LINUXRC}' not found."
 
 # create basic filesystem layout
 install -d ${DEST}/{bin,dev,etc,lib,loopfs,proc,sbin,sys,sysroot} || die
@@ -337,6 +351,9 @@
 # pata
 install_kernel_modules "${MODULES_PATA}"
 
+# framebuffer
+install_kernel_modules "${MODULES_FRAMEBUFFER}"
+
 # show all modules
 for i in ${ALL_MODULES}
 do