2000-12-28 11:51:08

by Luca Montecchiani

[permalink] [raw]
Subject: [patch-2.2.18] some trivial patch...

Hi Alan,

the first patch is a must for kernels that load scsi driver from initrd
;)
the second one allow "make install" to work also if lilo isn't
installed..

main.patch :

diff -ur linux-2.2.18.orig/init/main.c linux-2.2.18.tl/init/main.c
--- linux-2.2.18.orig/init/main.c Mon Dec 11 01:49:44 2000
+++ linux-2.2.18.tl/init/main.c Thu Dec 28 11:37:27 2000
@@ -485,7 +485,7 @@
{ "hdk", 0x3900 },
{ "hdl", 0x3940 },
#endif
-#ifdef CONFIG_BLK_DEV_SD
+#if defined(CONFIG_BLK_DEV_SD) || defined(CONFIG_BLK_DEV_SD_MODULE)
{ "sda", 0x0800 },
{ "sdb", 0x0810 },
{ "sdc", 0x0820 },


nolilo.patch :

diff -u -r kernel-2.2.18-orig/arch/i386/boot/install.sh
kernel-2.2.18-teamlinux/arch/i386/boot/install.sh
--- kernel-2.2.18-orig/arch/i386/boot/install.sh Tue Jan 3
12:57:26 1995
+++ kernel-2.2.18-teamlinux/arch/i386/boot/install.sh Tue Dec 19
16:21:24 2000
@@ -36,4 +36,10 @@
cat $2 > $4/vmlinuz
cp $3 $4/System.map

-if [ -x /sbin/lilo ]; then /sbin/lilo; else /etc/lilo/install; fi
+if [ -x /sbin/lilo ]; then
+ /sbin/lilo
+elif [ -x /etc/lilo/install ]; then
+ /etc/lilo/install
+fi
+
+# Grub rulez ;)