diff options
| -rwxr-xr-x | make_boot_img | 2 | ||||
| -rwxr-xr-x | update_kernel | 20 |
2 files changed, 13 insertions, 9 deletions
diff --git a/make_boot_img b/make_boot_img index acfb27093..09b1b9222 100755 --- a/make_boot_img +++ b/make_boot_img @@ -41,7 +41,7 @@ sub initrd { _ "echo y | mke2fs $tmp"; _ "$sudo mount $tmp $mnt -o loop"; _ "$sudo cp -a $instdir/$inst1/* $mnt"; - _ "$sudo install -d $mnt/modules"; + _ "sudo cp -f install_${type}_modules/* $mnt/modules/" if -d "install_${type}_modules"; _ "$sudo cp -f modules/${type}_modules.cgz $mnt/modules/modules.cgz"; _ "$sudo cp -f modules/modules.dep $mnt/modules/"; _ "$sudo umount $mnt"; diff --git a/update_kernel b/update_kernel index 65fd947ee..9a339f688 100755 --- a/update_kernel +++ b/update_kernel @@ -19,8 +19,7 @@ NETWORK_DRIVERS=" smc-ultra32.o tlan.o tulip.o via-rhine.o wavelan.o wd.o yellowfin.o - nfs.o lockd.o sunrpc.o - 3c589_cs.o" + nfs.o lockd.o sunrpc.o" # 3c589_cs.o ibmtr_cs.o nmclan_cs.o pcnet_cs.o smc91c92_cs.o wavelan_cs.o # fmvj18x_cs.o netwave_cs.o xirc2ps_cs.o 3c574_cs.o" @@ -44,16 +43,16 @@ CD_DRIVERS="aztcd.o cm206.o isp16.o mcdx.o sbpcd.o sonycd535.o cdu31a.o gscd.o m BLOCK_DRIVERS="DAC960.o cpqarray.o" -PCMCIAMODULES="pcmcia_core.o tcic.o ds.o i82365.o" - MISCMODULES="lp.o parport_pc.o parport.o loop.o" FSMODULES="vfat.o fat.o" -NETWORK_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $NETWORK_DRIVERS" -CDROM_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $SCSI_DRIVERS $CD_DRIVERS isofs.o" -HD_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $SCSI_DRIVERS $BLOCK_DRIVERS" -PCMCIA_MODULES="$PCMCIAMODULES $PCMCIA_DRIVERS $MISCMODULES $FSMODULES" +NETWORK_MODULES="$MISCMODULES $FSMODULES $NETWORK_DRIVERS" +CDROM_MODULES="$MISCMODULES $FSMODULES $SCSI_DRIVERS $CD_DRIVERS isofs.o" +HD_MODULES="$MISCMODULES $FSMODULES $SCSI_DRIVERS $BLOCK_DRIVERS" +PCMCIA_MODULES="$PCMCIA_DRIVERS $MISCMODULES $FSMODULES" + +PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o" cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* vmlinuz @@ -73,3 +72,8 @@ rm -rf modules ; install -d modules ls $PCMCIA_MODULES | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz rm -f $NETWORK_MODULES $CDROM_MODULES $HD_MODULES $PCMCIA_MODULES # leave in the directory non-install1 used modules ) + +rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules +(cd modules; + cp $PCMCIA_INSTALLMODULES ../install_pcmcia_modules/ +) |