%n lilo %v 19 %c * %l * %b * %d * %f * %t lilo-19.tgz %w Linux %% %setup patch -u -p1 <<'ENDPATCH' diff -ru2N lilo-19/Makefile lilo-MCC/Makefile --- lilo-19/Makefile Mon May 20 23:36:19 1996 +++ lilo-MCC/Makefile Sat Aug 10 00:19:08 1996 @@ -44,5 +44,5 @@ LD86=ld86 -0 -CFLAGS=-Wall -Wno-parentheses -g $(PCONFIG) +CFLAGS=-Wall -Wno-parentheses -O6 $(PCONFIG) LDFLAGS=#-Xlinker -qmagic @@ -127,7 +127,6 @@ if [ -f $$ROOT$(BOOT_DIR)/os2_d.b ]; then \ mv $$ROOT$(BOOT_DIR)/os2_d.b $$ROOT$(BOOT_DIR)/os2_d.old; fi - cp boot.b any_b.b any_d.b chain.b os2_d.b $$ROOT$(BOOT_DIR) - cp lilo $$ROOT$(SBIN_DIR) - strip $$ROOT$(SBIN_DIR)/lilo + install -m 444 boot.b any_b.b any_d.b chain.b os2_d.b $$ROOT$(BOOT_DIR) + install -s -m 555 lilo $$ROOT$(SBIN_DIR) @if [ -e $$ROOT/etc/lilo/install ]; then echo; \ echo -n "$$ROOT/etc/lilo/install is obsolete. LILO is now ";\ @@ -147,8 +146,8 @@ clean: rm -f *.o *.img *.lis first.s second.s chain.s any_b.s \ - any_d.s dos_d.s os2_d.s tmp_make first.b second.b + any_d.s dos_d.s dump.s os2_d.s tmp_make first.b second.b spotless: clean - rm -f lilo activate boot.b chain.b any_b.b any_d.b dos_d.b \ + rm -f lilo activate boot.b chain.b any_b.b any_d.b dos_d.b dump.b \ os2_d.b dparam.com diff -ru2N lilo-19/geometry.c lilo-MCC/geometry.c --- lilo-19/geometry.c Mon Apr 29 16:12:35 1996 +++ lilo-MCC/geometry.c Thu Sep 5 10:23:27 1996 @@ -230,12 +230,20 @@ get_all = all || MAJOR(device) != MAJOR_FD; + if (MAJOR(device) == MAJOR_RAM) get_all = 0; if (!MAJOR(device)) die("Trying to map files from unnamed device 0x%04x (NFS ?)",device); - if (device == MAJMIN_RAM) - die("Trying to map files from your RAM disk. " - "Please check -r option or ROOT environment variable."); if (get_all) fd = dev_open(&dev,device,O_NOACCESS); else fd = -1; /* pacify GCC */ switch (MAJOR(device)) { + case MAJOR_RAM: + if (!nowarn) + fprintf(stderr, "Warning: running LILO on a ram disk " + "to create a floppy boot image.\n"); + geo->device = 0; + geo->cylinders = 80; + geo->heads = 2; + geo->sectors = 18; + geo->start = 0; + break; case MAJOR_FD: geo->device = device & 3; diff -ru2N lilo-19/lilo.h lilo-MCC/lilo.h --- lilo-19/lilo.h Mon Apr 29 15:53:25 1996 +++ lilo-MCC/lilo.h Thu Sep 5 10:09:05 1996 @@ -16,5 +16,5 @@ to the version number of the entire package. */ -#define MAJMIN_RAM 0x101 /* RAM disk */ +#define MAJOR_RAM 1 /* RAM disk */ #define MAJOR_FD 2 /* floppy disks */ #define MAJOR_HD 3 /* IDE-type hard disks */ ENDPATCH make * make install %%