I would like to have these patch(es) applied.
Explanation:
Makefile
* We wan't to use a 2.2.5 kernel in potato, instead of the 2.0.36
from slink.
basedisks.sh
* Create the raid devices (/dev/md[0-3])
rootdisk.sh
* Create the raid devices (/dev/md[0-3])
* Use maximum compression on all files compressed. Migth save a byte
or two...
* Remove all reference to the nfslock library in the libraries on the
rootdisk.
scripts/drivers/install.sh
* Force a link on the ip{port|user} commands. Had some troubles when
trying to link to a file/link that already existed.
* Link the cardmgr file instead of moving it.
scripts/rescue/syslinux.cfg
* Added a 'serial[01] option, to have the console on the serial port.
* Added a 'tftp' option, to yell on the network for an IP address and
root disk (untested)
scripts/rescue/messages/C/f3.txt
* Added information on the new boot options (serial[01], tftp).
* Use emacs's 'set-justification-full' to beatify the text...
scripts/rootdisk/EXTRACT_LIST_i386
* Extract stuff from the 'raidtools' package (since we are using a 2.2
kernel, we don't use the 'mdutils' package).
scripts/rootdisk/SMALL_BASE_LIST_i386
* Don't extract cardmgr.
* Extract the raid creation/management programs (md{add|create|run|stop})
utilities/dbootstrap/Makefile
* We wan't to use a 2.2.5 kernel in potato, instead of the 2.0.36
from slink.
* ../busybox/cp.o must be linked, othervise busybox woun't compile (?).
This should have been set in the main Makefile. Patch for that later.
utilities/dbootstrap/baseconfig.c
* 'Prettier' fstab. Use tabs instead of spaces. I don't know how many times
I had to modify my fstab on my installs, to have 'beatifull' columnization :)
We really need to add an entry for /dev/pts to (?)
utilities/dbootstrap/main.c
* Have maximum length of kernel name 30 instead of 20 (I like to have the
'full name' of my kernels, to be able to have multiple kernels with the
same 'basic' version. Ex:
[pts/1.papadoc]$ uname -a
Linux papadoc 2.2.3-int-ac3-spec #5 Mon Mar 22 09:15:20 CET 1999 i586 unknown
utilities/dbootstrap/netconfig.c
* 'Prettier' network script.
----- s n i p p -----
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/Makefile,v
retrieving revision 1.84
diff -u -r1.84 Makefile
--- Makefile 1999/04/06 18:35:19 1.84
+++ Makefile 1999/04/20 18:29:32
@@ -69,7 +69,7 @@
kbd_package:=$(shell $(pathcmd:P=kbd-data_0.97*.deb))
else
ifeq ($(architecture), i386)
- kver:=2.0.36
+ kver:=2.2.5
else
ifeq ($(architecture), sparc)
altkver:=2.2.1
Index: basedisks.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/basedisks.sh,v
retrieving revision 1.37
diff -u -r1.37 basedisks.sh
--- basedisks.sh 1999/03/10 20:47:23 1.37
+++ basedisks.sh 1999/04/20 18:29:34
@@ -123,7 +123,7 @@
(cd $B/dev; /dev/MAKEDEV local )
;;
esac
-(cd $B/dev; /dev/MAKEDEV initrd rtc )
+(cd $B/dev; /dev/MAKEDEV initrd rtc md )
#mknod $B/dev/initrd b 1 250
#mknod $B/dev/ram0 b 1 0
#mknod $B/dev/rtc b 10 35
Index: rootdisk.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/rootdisk.sh,v
retrieving revision 1.58
diff -u -r1.58 rootdisk.sh
--- rootdisk.sh 1999/04/06 19:06:02 1.58
+++ rootdisk.sh 1999/04/20 18:29:42
@@ -209,7 +209,7 @@
i386)
# generic-i386 is a disk space hog. We really don't need a bazillion /dev/pty*
# devices on the root floppy, do we?
- boot_floppies_dev="std tty1 tty2 tty3 tty4 ttyS0 ttyS1 ttyS2 ttyS3 lp fd fd0 fd1 xda xdb hda hdb hdc hdd sda sdb sdc sdd sde sdf sdg sdh initrd rtc loop scd0 scd1 scd2 scd3 sonycd mcd mcdx cdu535 lmscd sbpcd aztcd bpcd"
+ boot_floppies_dev="std tty1 tty2 tty3 tty4 ttyS0 ttyS1 ttyS2 ttyS3 lp fd fd0 fd1 xda xdb hda hdb hdc hdd sda sdb sdc sdd sde sdf sdg sdh initrd rtc loop scd0 scd1 scd2 scd3 sonycd mcd mcdx cdu535 lmscd sbpcd aztcd bpcd md"
;;
m68k)
boot_floppies_dev="std tty1 tty2 tty3 tty4 ttyS0 ttyS1 fd fd0 fd1 hda hdb hdc hdd sda sdb sdc sdd sde sdf sdh ada adb adc add ade adf fb initrd rtc loop scd0 scd1 scd2 scd3"
@@ -285,7 +285,7 @@
done
if [ "$fontfound" ]; then
mkdir -p $R/$fontsdir
- gzip -cdf $fontfound > $R/$fontsdir/$font
+ gzip -9cdf $fontfound > $R/$fontsdir/$font
fi
fi
@@ -294,11 +294,11 @@
[ -f "$fonttest" -o -f "$fonttest.gz" ] && sfontfound=$fonttest
done
if [ "$sfontfound" ]; then
- if [ `gzip -cdf $sfontfound | wc -c` = 4096 ]; then
+ if [ `gzip -9cdf $sfontfound | wc -c` = 4096 ]; then
printf '\x36\x04\x00\x10' > $sfont
- gzip -cdf $sfontfound >> $sfont
+ gzip -9cdf $sfontfound >> $sfont
else
- gzip -cdf $sfontfound | psfstriptable $sfontfound $sfont
+ gzip -9cdf $sfontfound | psfstriptable $sfontfound $sfont
fi
fi
fi
@@ -370,7 +370,7 @@
TMP=`LD_LIBRARY_PATH=$E/lib:$E/usr/lib ldd $EXECUTABLES 2>/dev/null | \
awk -v E="^$E" -v L="/lib/$ldlib" -- '$3=="not" {print $1; next}; \
($3!~E) && ($1!~L) {print $3}' | grep -v "dynamic" | \
- sort -u`
+ sort -u | grep -v '/lib/nfslock.so.0'`
# awk -v E="^$E" -v L="$ldlib" -- '$3=="not" {print $1; next}; \
# ($3!~E) && ($1!~"/lib/"L) {print $3}' | \
Index: scripts/drivers/install.sh
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/drivers/install.sh,v
retrieving revision 1.13
diff -u -r1.13 install.sh
--- scripts/drivers/install.sh 1999/02/19 00:25:12 1.13
+++ scripts/drivers/install.sh 1999/04/20 18:29:45
@@ -22,9 +22,12 @@
test -f /usr/bin/whiptail || ln -sf `pwd`/usr/bin/whiptail /usr/bin/whiptail
if [ -e ${FLOPPY}/pcmcia.tgz ]; then
zcat < ${FLOPPY}/pcmcia.tgz |star
- ln -si `pwd`/sbin/ifport /sbin/ifport
- ln -si `pwd`/sbin/ifuser /sbin/ifuser
- mv `pwd`/sbin/cardmgr /sbin/cardmgr
+ ln -sif `pwd`/sbin/ifport /sbin/ifport
+ ln -sif `pwd`/sbin/ifuser /sbin/ifuser
+ ln -sif `pwd`/sbin/cardmgr /sbin/cardmgr
+fi
+if [ -e ${FLOPPY}/mdtab ]; then
+ cp ${FLOPPY}/mdtab ${DDIR}/etc/mdtab
fi
sync
Index: scripts/rescue/syslinux.cfg
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rescue/syslinux.cfg,v
retrieving revision 1.5
diff -u -r1.5 syslinux.cfg
--- scripts/rescue/syslinux.cfg 1999/01/14 00:47:07 1.5
+++ scripts/rescue/syslinux.cfg 1999/04/20 18:29:45
@@ -37,4 +37,13 @@
APPEND vga=normal noinitrd root=/dev/fd1 __tecra__
LABEL rescue
APPEND vga=normal noinitrd
+ KERNEL linux
+LABEL serial0
+ APPEND vga=normal load_ramdisk=1 prompt_ramdisk=1 initrd=root.bin console=/dev/ttyS0 serial=0,9600n8
+ KERNEL linux
+LABEL serial1
+ APPEND vga=normal load_ramdisk=1 prompt_ramdisk=1 initrd=root.bin console=/dev/ttyS1 serial=1,9600n8
+ KERNEL linux
+LABEL tftp
+ APPEND vga=normal load_ramdisk=1 noinitrd root=/dev/nfs nfsroot=:/tftpdir/install/root
KERNEL linux
Index: scripts/rescue/messages/C/f3.txt
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rescue/messages/C/f3.txt,v
retrieving revision 1.1
diff -u -r1.1 f3.txt
--- scripts/rescue/messages/C/f3.txt 1998/10/12 13:53:34 1.1
+++ scripts/rescue/messages/C/f3.txt 1999/04/20 18:29:46
@@ -1,24 +1,24 @@
BOOT METHODS
+ At the `boot:' prompt you can enter a boot method followed by boot
+ parameters. (Boot parameters are listed in the <F4> and <F5> screens.)
-At the `boot:' prompt you can enter a boot method followed by boot
-parameters. (Boot parameters are listed in the <F4> and <F5> screens.)
-
Available boot methods:
m4_ifdef(`__size1440__',
`default
- Start the installation.
-')
+ Start the installation.')
(For these two methods you need an extra root floppy.)
+
ramdisk0 (or ramdisk1)
- Start installation, load the ramdisk from the first
- (or the second) floppy drive
+ Start installation, load the ramdisk from the first (or second) floppy drive
floppy0 (or floppy1)
- Start installation, mount the floppy in the first (or the second)
- floppy drive as root.
- (If you have only one floppy drive, you cannot load base from
- floppy0, but you can install from other media (CD, harddisk ...)
+ Start installation, mount the floppy in the first (or second) floppy drive as
+ root. (If you have only one floppy drive, you cannot load base from floppy0,
+ but you can install from other media (CD, harddisk ...)
+tftp
+ Start installation by doing a bootp/rarp request on the network, download the
+ installation images through tftp
rescue
- Boot and mount any root filesystem. The root filesystem must be given at
- the prompt, so e.g. type `rescue root=/dev/hda1'
+ Boot and mount any root filesystem. The root filesystem must be given at the
+ prompt, so e.g. type `rescue root=/dev/hda1'
Index: scripts/rootdisk/EXTRACT_LIST_i386
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rootdisk/EXTRACT_LIST_i386,v
retrieving revision 1.7
diff -u -r1.7 EXTRACT_LIST_i386
--- scripts/rootdisk/EXTRACT_LIST_i386 1999/03/10 20:53:56 1.7
+++ scripts/rootdisk/EXTRACT_LIST_i386 1999/04/20 18:30:00
@@ -4,3 +4,4 @@
pcmcia-cs
util-linux
newt0.25
+raidtools
Index: scripts/rootdisk/SMALL_BASE_LIST_i386
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/scripts/rootdisk/SMALL_BASE_LIST_i386,v
retrieving revision 1.3
diff -u -r1.3 SMALL_BASE_LIST_i386
--- scripts/rootdisk/SMALL_BASE_LIST_i386 1998/03/30 18:58:44 1.3
+++ scripts/rootdisk/SMALL_BASE_LIST_i386 1999/04/20 18:30:00
@@ -3,5 +3,8 @@
sbin/isapnp
sbin/pnpdump
sbin/ifport
-sbin/cardmgr
+sbin/mdadd
+sbin/mdcreate
+sbin/mdrun
+sbin/mdstop
usr/sbin/rdev
Index: utilities/dbootstrap/Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- utilities/dbootstrap/Makefile 1999/04/03 19:40:35 1.4
+++ utilities/dbootstrap/Makefile 1999/04/20 18:30:10
@@ -2,7 +2,7 @@
LIBSG = -lc -loadtrm #-lefence
#ifndef KVER
- KVER=2.0.35
+ KVER=2.2.5
#endif
ARCH=$(shell dpkg --print-architecture)
@@ -26,7 +26,7 @@
../busybox/fdflush.o ../busybox/losetup.o ../busybox/mount.o \
../busybox/mkdir.o ../busybox/utility.o ../busybox/findmount.o \
../busybox/umount.o ../busybox/swapon.o ../busybox/swapoff.o \
- ../busybox/block_device.o
+ ../busybox/block_device.o ../busybox/cp.o
LIBFDISK = ../libfdisk/libfdisk.a
LIBBOGL = ../bogl/libbogl.a
Index: utilities/dbootstrap/baseconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/baseconfig.c,v
retrieving revision 1.2
diff -u -r1.2 baseconfig.c
--- utilities/dbootstrap/baseconfig.c 1999/03/27 23:13:15 1.2
+++ utilities/dbootstrap/baseconfig.c 1999/04/20 18:30:10
@@ -221,22 +221,22 @@
fprintf(fstab,
"# /etc/fstab: static file system information.\n"
"#\n"
-"# <file system> <mount point> <type> <options> <dump> <pass>\n"
-"%-15s / %s %s 0 1\n",
+"# <file system> <mount point> <type> <options> <dump>\t<pass>\n"
+"%-15s\t/\t\t%s\t%s\t0\t1\n",
Root->name, fsname, fsopts);
if (swapon_partitions != NULL) {
p = swapon_partitions;
while (p) {
fprintf(fstab,
- "%-15s none swap sw 0 0\n",
+ "%-15s\tnone\t\tswap\tsw\t\t0\t0\n",
p->name);
p=p->next_in_use;
}
}
fprintf(fstab,
-"proc /proc proc defaults 0 0\n");
+"proc\t\t/proc\t\tproc\tdefaults\t0\t0\n");
fclose(fstab);
Index: utilities/dbootstrap/main.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/main.c,v
retrieving revision 1.3
diff -u -r1.3 main.c
--- utilities/dbootstrap/main.c 1999/04/03 19:25:15 1.3
+++ utilities/dbootstrap/main.c 1999/04/20 18:30:10
@@ -198,7 +198,7 @@
char suffix_arch[16]="";
#ifdef MULTI_KERNELS
/* initialize real_kver & real_arch */
- char key[20];
+ char key[30];
FILE *f = fopen("/proc/sys/kernel/osrelease", "r");
fscanf(f, "%s", key);
fclose(f);
Index: utilities/dbootstrap/netconfig.c
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/netconfig.c,v
retrieving revision 1.1
diff -u -r1.1 netconfig.c
--- utilities/dbootstrap/netconfig.c 1999/03/21 03:23:31 1.1
+++ utilities/dbootstrap/netconfig.c 1999/04/20 18:30:11
@@ -466,6 +466,7 @@
{
p_file=fopen(path,"a");
{
+ fprintf(p_file,"#\n");
fprintf(p_file,"IPADDR=%s\n",IPtostr(prtbuf,ipaddr));
fprintf(p_file,"NETMASK=%s\n",IPtostr(prtbuf,netmask));
fprintf(p_file,"NETWORK=%s\n",IPtostr(prtbuf,network));
@@ -475,6 +476,7 @@
else
fprintf(p_file,"GATEWAY=\n");
+ fprintf(p_file,"#\n");
fprintf(p_file,
"ifconfig %s ${IPADDR} netmask ${NETMASK} broadcast ${BROADCAST}\n",
netinterface);
@@ -527,6 +529,7 @@
fprintf(pcmcia_file,"# Network adapter configuration\n#\n# Automatically generated during the Debian Installation\n#\ncase \"$ADDRESS\" in\n*,*,*,*)\n");
fprintf(pcmcia_file,"\tIF_PORT=\"%s\"\n",transceiver);
fprintf(pcmcia_file,"\t# Use BOOTP [y/n]\n\tBOOTP=\"n\"\n");
+ fprintf(pcmcia_file,"#\n");
fprintf(pcmcia_file,"\tIPADDR=\"%s\"\n",IPtostr(prtbuf,ipaddr));
fprintf(pcmcia_file,"\tNETMASK=\"%s\"\n",IPtostr(prtbuf,netmask));
fprintf(pcmcia_file,"\tNETWORK=\"%s\"\n",IPtostr(prtbuf,network));
@@ -536,6 +539,7 @@
else
fprintf(pcmcia_file,"\tGATEWAY=\"\"\n");
fprintf(pcmcia_file,"\tDOMAIN=\"%s\"\n",domain);
+ fprintf(pcmcia_file,"#\n");
if(strcmp(nameserver,"none"))
{
aux=ns=strdup(nameserver);
--
We are GNU. You will be GPL'ed. Resistance is futile.
/ \ / \ / \ / \ / \ / \ Turbo Fredriksson <turbo@debian.org>
( D | e | b | i | a | n ) Debian Certified Linux Developer
\_/ \_/ \_/ \_/ \_/ \_/ Gothenburg/Sweden
Please always Cc to me when replying to me on the lists.
--
Nazi Mossad CIA radar SDI South Africa strategic Ft. Meade North Korea
explosion jihad nuclear fissionable Waco, Texas Soviet
Attachment:
pgpubQkcfMFBW.pgp
Description: PGP signature