--- trunk/mkinitrd/lib/linuxrc.sh 2006/02/23 12:02:04 334 +++ trunk/mkinitrd/lib/linuxrc.sh 2006/03/25 11:29:06 353 @@ -1,5 +1,5 @@ #!/bin/sh -# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/lib/linuxrc.sh,v 1.2 2006-02-23 12:02:04 niro Exp $ +# $Header: /home/cvsd/magellan-cvs/magellan-src/mkinitrd/lib/linuxrc.sh,v 1.5 2006-03-25 11:29:06 niro Exp $ # loads given kernel modules load_kernel_modules() @@ -71,6 +71,9 @@ mkdir /dev/pts mkdir /dev/shm mkdir /dev/mapper +mkdir /dev/misc +mkdir /dev/fb +mkdir /dev/vc mknod /dev/console c 5 1 mknod /dev/null c 1 3 mknod /dev/ram b 1 1 @@ -97,7 +100,6 @@ mknod /dev/ttyS3 c 4 67 echo "-- Starting udevd ..." -ln -snf bin /sbin /sbin/udevstart ln -snf /proc/self/fd /dev/fd ln -snf fd/0 /dev/stdin @@ -144,8 +146,8 @@ # needed for the usbstick, the timeout maybe to short if [ "${DOUSB}" = "yes" ]; then - echo "-- Waiting 3 seconds for possible usb mount ..." - sleep 3 + echo "-- Waiting 8 seconds for possible usb mount ..." + sleep 8 fi # searching cdrom with cdid @@ -155,14 +157,18 @@ echo "Searching for a boot device ..." # searching usbstick -check_drives "/dev/scsi/host[0-99]/bus[0-99]/target[0-99]/lun[0-99]/part[0-99]" "vfat" +if [ "${DOUSB}" = "yes" ]; then + check_drives "/dev/scsi/host[0-99]/bus[0-99]/target[0-99]/lun[0-99]/part[0-99]" "vfat" +fi # for cdrom_device in $CDROM_LIST (ide) check_drives "/dev/cdroms/*" iso9660 check_drives "/dev/hd*" iso9660 # scsi cdroms -check_drives "/dev/sr*" iso9660 +if [ "${DOSCSI}" = "yes" ] || [ "${DOSATA}" = "yes" ]; then + check_drives "/dev/sr*" iso9660 +fi # mount our rootfs from cdrom if [ "${BOOT_DEVICE}" = "" ] @@ -191,7 +197,7 @@ do ln -s mnt/cloop/${x} ${x} done - mkdir -p initrd proc tmp sys var/tmp dev + mkdir -p initrd proc tmp sys var/tmp dev media # make /sysroot/dev/console & /mnt/dev/null [ ! -e /sysroot/dev/console ] && mknod -m 600 /sysroot/dev/console c 5 1