For syslinux.cfg, I think we should also include a new label 'linux'
which just does the default, some people will want to type linux (and
it may be in some docs too).
Also, I removed the second ifdef. It was confusing, applied to the
wrong label, and wasn't applied to all the labels it should have
been. Since it just affects labels, and there's no overlap, the extra
labels won't hurt on other disksizes.
And, I removed the redundant redefinition of the kernel file. The man
page assures me that the default behavior is to use the DEFAULT kernel
file and DEFAULT APPEND lines if none are given.
Index: syslinux.cfg
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rescue/syslinux.cfg,v
retrieving revision 1.12
diff -u -r1.12 syslinux.cfg
--- syslinux.cfg 2001/04/08 20:49:26 1.12
+++ syslinux.cfg 2002/03/10 16:21:48
@@ -1,5 +1,5 @@
# see /usr/doc/syslinux/syslinux.doc.gz for file format description
-DEFAULT linux
+DEFAULT linux.bin
ifdef(`__size2880__',
`APPEND vga=normal load_ramdisk=1 ramdisk_size=16384 initrd=root.bin __disksize__
__flavor__',
`APPEND vga=normal noinitrd load_ramdisk=1 prompt_ramdisk=1 ramdisk_size=16384
root=/dev/fd0 __disksize__ __flavor__')
@@ -16,28 +16,29 @@
F8 f8.txt
F9 f9.txt
F0 f10.txt
-ifdef(`__size1440__',
-`LABEL initrd
- KERNEL linux
- APPEND vga=normal load_ramdisk=1 ramdisk_size=16384 initrd=root.bin
__disksize__ __flavor__')
+LABEL linux
+LABEL initrd
LABEL ramdisk
- KERNEL linux
APPEND vga=normal noinitrd load_ramdisk=1 prompt_ramdisk=1 ramdisk_size=16384
root=/dev/fd0 __disksize__ __flavor__
LABEL ramdisk0
- KERNEL linux
APPEND vga=normal noinitrd load_ramdisk=1 prompt_ramdisk=1 ramdisk_size=16384
root=/dev/fd0 __disksize__ __flavor__
LABEL ramdisk1
- KERNEL linux
APPEND vga=normal noinitrd load_ramdisk=1 prompt_ramdisk=1 ramdisk_size=16384
root=/dev/fd1 __disksize__ __flavor__
LABEL floppy
- KERNEL linux
APPEND vga=normal noinitrd root=/dev/fd0 __disksize__ __flavor__
LABEL floppy0
- KERNEL linux
APPEND vga=normal noinitrd root=/dev/fd0 __disksize__ __flavor__
LABEL floppy1
- KERNEL linux
APPEND vga=normal noinitrd root=/dev/fd1 __disksize__ __flavor__
LABEL rescue
APPEND vga=normal noinitrd
- KERNEL linux
+
+
+
+
+
+
+
+
+
+
--
*------v--------- Installing Debian GNU/Linux 3.0 --------v------*
| <http://www.debian.org/releases/woody/installmanual> |
| debian-imac (potato): <http://debian-imac.sourceforge.net> |
| Chris Tillman [EMAIL PROTECTED] |
| May the Source be with you |
*----------------------------------------------------------------*
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
