Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26331
Modified Files:
linuxrc mount_cdrom
Log Message:
be a little more talkative during boot
Index: linuxrc
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/linuxrc,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- linuxrc 4 May 2004 01:04:52 -0000 1.69
+++ linuxrc 17 May 2004 23:05:35 -0000 1.70
@@ -53,16 +53,16 @@
return 0
else
$YELLOW
- echo "file not found."
+ echo "file not found"
$NORMAL
umount /floppy # in case user swaps floppy when we are accepting input
fi
else
$RED
- echo "mount failed."
+ echo "mount failed"
$NORMAL
fi
- done
+ done
return 1
}
@@ -166,6 +166,9 @@
# mount proc
mount -n -t proc none /proc
+# mount usb
+mount -n -t usbdevfs none /proc/bus/usb
+
echo Kernel $(uname -r)
# mount shared memory filesystem with a limit of 40GB (for now)
@@ -178,6 +181,8 @@
echo "waiting until usb-storage driver has initialized all devices ..."
sleep 15
+#grep usb-storage /proc/bus/usb/devices
+
echo -e "Loading loop-AES module";
modprobe loop 2> /dev/null
@@ -340,6 +345,9 @@
echo "Mounting DEV FS on /cdrom/dev"
mount -n -t devfs none /cdrom/dev
+# unmount usb
+umount /proc/bus/usb
+
# unmount proc because the final system will mount it again
umount /proc
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- mount_cdrom 8 May 2004 01:54:06 -0000 1.24
+++ mount_cdrom 17 May 2004 23:05:35 -0000 1.25
@@ -34,7 +34,7 @@
for disk in $CDROMS
do
- echo checking $disk
+ echo -n "checking $disk "
if mount -n -t iso9660 -o ro $disk $1 2> /dev/null; then
if [ -e $1/DEVIL-LINUX ] ; then
if [ "$3" != "silent" ]; then
@@ -45,8 +45,15 @@
echo $disk > /shm/DL_DEVICE
exit 0
else
+ $YELLOW
+ echo "wrong media"
+ $NORMAL
umount $1
fi
+ else
+ $RED
+ echo "mount failed"
+ $NORMAL
fi
done
@@ -56,9 +63,12 @@
PARTITIONS="$PARTITIONS_IDE $PARTITIONS_SCSI"
for disk in $PARTITIONS
do
- echo checking $disk
+ echo -n "checking $disk "
if mount -n -t auto -o rw,noatime $disk /mnt 2> /dev/null; then
if [ -e /mnt/DEVIL-LINUX ] ; then
+ $GREEN
+ echo "media found"
+ $NORMAL
if [ -e /mnt/bootcd.iso.new ] ; then
$BLUE
echo "****************************"
@@ -97,12 +107,19 @@
$YELLOW
echo -e "\nFound ISO ($dl_version) on $disk"
$NORMAL
- fi
+ fi
exit 0
fi
else
+ $YELLOW
+ echo "wrong media"
+ $NORMAL
umount /mnt
fi
+ else
+ $RED
+ echo "mount failed"
+ $NORMAL
fi
done
|
