cdrom module

src/addons/00-modules.sh

@@ -12,11 +12,10 @@ elif [ "$minimal" == true ]; then
 	cp -prf ${MODDIR}/kernel/{crypto,fs,lib,block} ${WORKDIR}/${MODDIR}
 	cp -prf ${MODDIR}/kernel/drivers/input/{keyboard,serio} ${WORKDIR}/${MODDIR}
 	cp -prf ${MODDIR}/kernel/drivers/{ata,md,mmc,firewire} ${WORKDIR}/${MODDIR}
-	if [ -d ${MODDIR}/kernel/drivers/block ] ; then 
-		cp -prf ${MODDIR}/kernel/drivers/block/ ${WORKDIR}/${MODDIR}
-	fi
 	cp -prf ${MODDIR}/kernel/drivers/{scsi,pcmcia,virtio} ${WORKDIR}/${MODDIR}
 	cp -prf ${MODDIR}/kernel/drivers/usb/ ${WORKDIR}/${MODDIR}
+	# Some kernels not have this directories.
+	cp -prf ${MODDIR}/kernel/drivers/{block,cdrom}/ ${WORKDIR}/${MODDIR} || true
 else
 	debug "Install main modules"
 	cp -prf ${MODDIR}/kernel/{crypto,fs,lib} ${WORKDIR}/${MODDIR}

src/scripts/02-modules.sh

 #!/busybox sh
-[ -n "$debug" ] || /bushbox ash
+[ -n "$debug" ] && /busybox ash
 msg "Loading filesystem drivers"
 ls /lib/modules/*/fs/ | sed "s/^/modprobe /g" | sed "s/\.ko//g" | sed "s/$/ &/g" > /fs
 sh /fs &>/dev/null

src/scripts/96-fsmount.sh

@@ -152,7 +152,7 @@ msg "Waiting for $device"
 	umount -lf $tmp
 }
 msg "Searching filesystem"
-[ -n "$debug" ] || /bushbox ash
+[ -n "$debug" ] && /busybox ash
 if [ "$boot" == "live" ]; then
 	live_boot || fallback_shell
 	msg "Booting from live-media" "($root)"