Update of /cvsroot/devil-linux/build/scripts/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9606
Modified Files:
install-on-usb
Log Message:
make sure we can use either the console or the serial port
Index: install-on-usb
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- install-on-usb 5 Jan 2005 19:00:56 -0000 1.18
+++ install-on-usb 9 Jan 2005 23:19:17 -0000 1.19
@@ -133,7 +133,7 @@
cat > $TMPDIR/grub.conf <<-EOF
timeout=10
serial --unit=0 --speed=9600 --word=8 --parity=no --stop=1
- terminal serial
+ terminal --timeout=10 serial console
# Devil-Linux Boot Line options:
# DL_config=/dev/discs/disc0/part1 - loads the etc.tar.bz2 form that device
# DL_config_no_scan - prevents scanning for etc.tar.bz2
@@ -144,7 +144,7 @@
# type device names.
title Devil-Linux - Serial Console
root (hd0,$2)
- kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK console=tty0 console=ttyS0,9600n8
+ kernel /boot/vmlinuz ro root=/dev/ram0 init=/linuxrc $RAMDISK console=tty0 console=ttyS0,9600n8
initrd /boot/initrd.gz
title Devil-Linux - Standard VGA
root (hd0,$2)
|
