malekith: bootdisk mkimages,1.9,1.10

[Michał Moskal]

Module name:    bootdisk
Changes by:     malekith

Changed RCS file: /cvsroot/bootdisk/mkimages,v
----------------------------
revision 1.10
date: 2002/03/22 10:09:10;  author: malekith;  state: Exp;  lines: +13 -7
- simplifications
- add ext2-mod on 2.4
- use genromfs on 2.4
- removed nfs from pcmcia and reiser from ide (can be still loaded from addon)
 

Index: mkimages
===================================================================
RCS file: /cvsroot/bootdisk/mkimages,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- mkimages	21 Mar 2002 15:55:40 -0000	1.9
+++ mkimages	22 Mar 2002 10:09:10 -0000	1.10
@@ -18,9 +18,15 @@
     opt="$opt -e $f"
   done
 
+  opt="$opt -m floppy,vfat"
+
+  echo
+  echo "Making $name bootdisk."
   sh scripts/mkinstaller -t `pwd`/targz $kernel_opt $opt "$@" \
   	-I bootdisk_${name}.txt \
 	-o bootdisk_${name}.img
+  echo
+  echo "Making $name slow bootdisk."
   sh scripts/mkinstaller -t `pwd`/targz -a $kernel_opt $opt "$@" \
   	-I bootdisk_${name}_slow.txt \
 	-o bootdisk_${name}_slow.img
@@ -53,7 +59,7 @@
 if [ "$KERNEL_VERCODE" -gt 2 ] ; then
   # we don't need much additional space on 2.4 bootdisk, tmpfs is used
   # for / anyway
-  kernel_opt="-A 100"
+  kernel_opt="-A 100 -m ext2 -R"
 else
   kernel_opt=""
 fi
@@ -65,10 +71,10 @@
     eth_addons="$eth_addons,eth/$f"
   done
   # eth-mod and such on addons... 2.4 is huge
-  mkimage net -p ui,net,lists -m floppy,vfat$eth_addons
+  mkimage net -p ui,net,lists -m $eth_addons
 else
   # supports net on ethernet devices
-  mkimage net -S 4096 -p ui,net,lists -m eth,nfs,af_packet,floppy,vfat
+  mkimage net -S 4096 -p ui,net,lists -m eth,nfs,af_packet
 fi
 
 short_cut=no
@@ -82,16 +88,16 @@
 
 # supports PCMCIA network cards
 network_conf
-mkimage pcmcia -p ui,lists,pcmcia,net -m floppy,vfat,nfs
+mkimage pcmcia -p ui,lists,pcmcia,net
 
 # supports ide devices and old cdroms
 cdrom_conf
-mkimage ide -p ui,lists -m ide,cdrom,old-cdrom,reiserfs,floppy,vfat
+mkimage ide -p ui,lists -m ide,cdrom,old-cdrom
 
 # installation from SCSI cdrom/disk, addons disk required for scsi-low
 cdrom_conf
-mkimage scsi -p ui,lists -m scsi,cdrom,reiserfs,floppy,vfat
+mkimage scsi -p ui,lists -m scsi,cdrom,reiserfs
 
 # image for official ISO
 cdrom_conf
-mkimage iso -D -S 4096 -p ui,lists -m cdrom,ide,scsi,scsi-low,floppy,vfat
+mkimage iso -D -S 4096 -p ui,lists -m cdrom,ide,scsi,scsi-low