--- trunk/mkinitrd/mkinitrd-livecd.sh	2006/02/21 00:02:17	333
+++ trunk/mkinitrd/mkinitrd-livecd.sh	2006/02/23 15:55:08	336
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd-livecd.sh,v 1.1 2006-02-21 00:02:17 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/mkinitrd-livecd.sh,v 1.2 2006-02-23 15:55:08 niro Exp $
 
 # mkinitrd-livecd
 #
@@ -40,17 +40,11 @@
 
 [ -e /etc/conf.d/mkinitrd-livecd ] && . /etc/conf.d/mkinitrd-livecd
 
-#LINUXRC="/home/tjoke/alx-cvs/magellan-src/mkinitrd/lib/linuxrc.sh"
-#MODULES_GENERIC="/home/tjoke/alx-cvs/magellan-src/mkinitrd/lib/modules.generic"
-#MODULES_USB="/home/tjoke/alx-cvs/magellan-src/mkinitrd/lib/modules.usb"
-#MODULES_SCSI="/home/tjoke/alx-cvs/magellan-src/mkinitrd/lib/modules.scsi"
-#MODULES_SATA="/home/tjoke/alx-cvs/magellan-src/mkinitrd/lib/modules.sata"
-
-LINUXRC="/usr/lib/mkinitrd-livecd/linuxrc.sh"
-MODULES_GENERIC="/usr/lib/mkinitrd-livecd/modules.generic"
-MODULES_USB="/usr/lib/mkinitrd-livecd/modules.usb"
-MODULES_SCSI="/usr/lib/mkinitrd-livecd/modules.scsi"
-MODULES_SATA="/usr/lib/mkinitrd-livecd/modules.sata"
+LINUXRC="/usr/lib/mkinitrd/linuxrc.sh"
+MODULES_GENERIC="/usr/lib/mkinitrd/modules.generic"
+MODULES_USB="/usr/lib/mkinitrd/modules.usb"
+MODULES_SCSI="/usr/lib/mkinitrd/modules.scsi"
+MODULES_SATA="/usr/lib/mkinitrd/modules.sata"
 
 compress=1
 allowmissing=""
@@ -250,6 +244,9 @@
 # need r00t privs
 [[ $(id -u) != 0 ]] && die "you must be r00t."
 
+# enforce initramfs method as default
+[[ -z ${IMAGE_TYPE} ]] && IMAGE_TYPE=initramfs
+
 while [ $# -gt 0 ]; do
 	case $1 in
 		--version)