I'd like to have this patch applied, please...
(Maybe not the 'Makefile' patch, but the rest?)
Index: Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/Makefile,v
retrieving revision 1.77
diff -u -r1.77 Makefile
--- Makefile 1999/04/01 12:47:21 1.77
+++ Makefile 1999/04/02 17:21:29
@@ -68,7 +68,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: 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/02 17:21:30
@@ -22,9 +22,9 @@
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
sync
Index: utilities/Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- utilities/Makefile 1999/03/27 23:11:31 1.16
+++ utilities/Makefile 1999/04/02 17:21:34
@@ -7,12 +7,12 @@
SPLIT_OBJECTS= floppy_split.o
all: floppy_split
- $(MAKE) -C libfdisk "CFLAGS=-O2 -DINCLUDE_DBOOTSTRAP" libfdisk.a
+ $(MAKE) -C libfdisk "CFLAGS=-O2 -DINCLUDE_DBOOTSTRAP -DOLDKERNEL" libfdisk.a
$(MAKE) -C dbootstrap KVER=$(KVER) INCLUDE_DBOOTSTRAP=1 build-objects
- $(MAKE) -C busybox INCLUDE_DBOOTSTRAP=1
+ $(MAKE) -C busybox "INCLUDE_DBOOTSTRAP=1 OLDKERNEL="
$(MAKE) -C writemaps loadkeys
ifneq ($(arch), m68k)
- $(MAKE) -C lowmemrd
+ $(MAKE) -C lowmemrd OLDKERNEL=
endif
clean:
Index: utilities/dbootstrap/Makefile
===================================================================
RCS file: /cvs/debian-boot/boot-floppies/utilities/dbootstrap/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- utilities/dbootstrap/Makefile 1999/03/27 23:11:32 1.3
+++ utilities/dbootstrap/Makefile 1999/04/02 17:21:35
@@ -24,7 +24,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
OBJECTS = $(patsubst %.c,%.o,$(wildcard *.c))
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/02 17:21:36
@@ -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.2
diff -u -r1.2 main.c
--- utilities/dbootstrap/main.c 1999/03/22 23:22:38 1.2
+++ utilities/dbootstrap/main.c 1999/04/02 17:21:36
@@ -197,7 +197,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/02 17:21:37
@@ -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.
--
nuclear cracking Peking NSA FBI SDI explosion [Hello to all my fans in
domestic surveillance] plutonium Ft. Bragg Honduras BATF assassination
Delta Force Legion of Doom
Attachment:
pgpiw_VIuYfHT.pgp
Description: PGP signature