bootdisk/trunk/batch-installer/ui/ui-wizard

[hawk]

Author: hawk
Date: Wed Mar 15 11:10:22 2006
New Revision: 7165

Modified:
   bootdisk/trunk/batch-installer/ui/ui-wizard
Log:
- fixed bug with reporting incorrect number of SCSI CD-ROMs
  on some hardware
- default /boot size increased to 30 MBs
- root partition on ext2 by default


Modified: bootdisk/trunk/batch-installer/ui/ui-wizard
==============================================================================
--- bootdisk/trunk/batch-installer/ui/ui-wizard	(original)
+++ bootdisk/trunk/batch-installer/ui/ui-wizard	Wed Mar 15 11:10:22 2006
@@ -274,7 +274,7 @@
         done
       fi
       if [ -f /proc/scsi/scsi ] ; then
-	scds=`cat /proc/scsi/scsi | grep "CD-ROM" | wc -l`
+	scds=`cat /proc/scsi/scsi | grep "Type:.*CD-ROM" | wc -l`
 	cscd=0
 	while [ $cscd -lt $scds ]; do
           autocdrom="$autocdrom /dev/scd$cscd"
@@ -658,7 +658,7 @@
 
   nls "Default scheme is:<br>"
   # maybe remove /boot altogether?
-  nls "1st partition on /boot (20 Mb)<br>" 
+  nls "1st partition on /boot (30 Mb)<br>" 
   nls "2nd partition on swap (%d Mb)<br>" "$swap_size"
   nls "3rd partition on / (rest)<br>" 
 }
@@ -688,7 +688,7 @@
   dest_part1_format_partition=yes
   dest_part1_options=defaults
   dest_part1_format_options=
-  dest_part1_size=20
+  dest_part1_size=30
   
   dest_part2_device=$dest_part"2"
   dest_part2_mnt_point=swap
@@ -700,7 +700,7 @@
   
   dest_part3_device=$dest_part"3"
   dest_part3_mnt_point=/
-  dest_part3_filesystem=xfs
+  dest_part3_filesystem=ext2
   dest_part3_format_partition=yes
   dest_part3_options=defaults
   dest_part3_format_options=