From bc5be8ae6923c0605df687918b35a77a735b1b35 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Sep 2000 13:06:05 +0000
Subject: no_comment

---
 update_kernel | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

(limited to 'update_kernel')

diff --git a/update_kernel b/update_kernel
index 35451dfac..68d0bd268 100755
--- a/update_kernel
+++ b/update_kernel
@@ -8,7 +8,8 @@ function f() {
 
 ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
 
-f "scsi disk" ; SCSI_DRIVERS=$v
+f "scsi" ; SCSI_DRIVERS=$v
+f "disk" ; DISK_DRIVERS=$v
 f "net" ; NETWORK_DRIVERS=$v
 f "scsi cdrom" ; CD_DRIVERS=$v
 f "pcmcia net_raw cdrom_raw scsi_raw disk_raw" ; PCMCIA_DRIVERS=$v
@@ -16,12 +17,13 @@ f "big net_raw cdrom_raw scsi_raw disk_raw" ; BIG_DRIVERS=$v
 f "pcmcia net cdrom scsi disk keepbig" ; ALL_DRIVERS=$v
 [ $ARCH == "i386" ] && FSMODULES="vfat.o fat.o"
 
-NETWORK_MODULES="$FSMODULES $NETWORK_DRIVERS"
-CDROM_MODULES="  $FSMODULES $CD_DRIVERS"
-HD_MODULES="     $FSMODULES $SCSI_DRIVERS loop.o isofs.o"
-PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS"
-BIG_MODULES="    $FSMODULES $BIG_DRIVERS"
-ALL_MODULES="    $FSMODULES $ALL_DRIVERS reiserfs.o"
+NETWORK_MODULES="  $FSMODULES $NETWORK_DRIVERS"
+CDROM_MODULES="    $FSMODULES $CD_DRIVERS"
+HD_MODULES="       $FSMODULES $SCSI_DRIVERS $DISK_DRIVERS loop.o isofs.o"
+HD_REISER_MODULES="$FSMODULES $SCSI_DRIVERS reiserfs.o loop.o isofs.o"
+PCMCIA_MODULES="   $FSMODULES $PCMCIA_DRIVERS"
+BIG_MODULES="      $FSMODULES $BIG_DRIVERS"
+ALL_MODULES="      $FSMODULES $ALL_DRIVERS reiserfs.o"
 NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o"
 
 PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
@@ -42,14 +44,15 @@ rm -rf modules ; install -d modules
     cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` .
     /sbin/depmod -m ../System.map -i -e *.o | perl -pe 's/\\\n//' | perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
     perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
-    ls *.o              | packdrake -b9s modules.cz 400000
-    ls *.o              | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2
-    ls $NETWORK_MODULES | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz
-    ls $CDROM_MODULES   | cpio --quiet -H crc -o | gzip -9 > cdrom_modules.cgz	
-    ls $HD_MODULES      | cpio --quiet -H crc -o | gzip -9 > hd_modules.cgz     
-    ls $PCMCIA_MODULES  | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz
-    ls $BIG_MODULES     | cpio --quiet -H crc -o | gzip -9 > other_modules.cgz
-    ls $ALL_MODULES     | cpio --quiet -H crc -o | gzip -9 > all_modules.cgz
+    ls *.o               | packdrake -b9s modules.cz 400000
+    ls *.o               | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2
+    ls $NETWORK_MODULES  | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz
+    ls $CDROM_MODULES    | cpio --quiet -H crc -o | gzip -9 > cdrom_modules.cgz	
+    ls $HD_MODULES       | cpio --quiet -H crc -o | gzip -9 > hd_modules.cgz     
+    ls $HD_REISER_MODULES| cpio --quiet -H crc -o | gzip -9 > hd_reiser_modules.cgz
+    ls $PCMCIA_MODULES   | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz
+    ls $BIG_MODULES      | cpio --quiet -H crc -o | gzip -9 > other_modules.cgz
+    ls $ALL_MODULES      | cpio --quiet -H crc -o | gzip -9 > all_modules.cgz
 [ "$ARCH" == "i386" ] && {
     cp $PCMCIA_INSTALLMODULES ../install_pcmcia_modules/
 }
-- 
cgit v1.2.1