Author: fehr Date: Mon Nov 19 12:51:52 2007 New Revision: 42158 URL: http://svn.opensuse.org/viewcvs/yast?rev=42158&view=rev Log: remove obsolete cruft Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/auto_part_functions.ycp trunk/storage/storage/src/include/auto_part_prepare.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=42158&r1=42157&r2=42158&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Nov 19 12:51:52 2007 @@ -2,6 +2,7 @@ Mon Nov 19 12:01:33 CET 2007 - fehr@suse.de - changed help text about large disks (#341563) +- remove obsolete cruft ------------------------------------------------------------------- Fri Nov 16 11:13:04 CET 2007 - aschnell@suse.de Modified: trunk/storage/storage/src/include/auto_part_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto_part_functions.ycp?rev=42158&r1=42157&r2=42158&view=diff ============================================================================== --- trunk/storage/storage/src/include/auto_part_functions.ycp (original) +++ trunk/storage/storage/src/include/auto_part_functions.ycp Mon Nov 19 12:51:52 2007 @@ -25,8 +25,8 @@ global define contains_extended (list partitions) ``{ global define extended_region (list partitions) ``{ global define calculate_selected_region (list selection, any extended_region) ``{ - global define can_create_logical (list partitions) ``{ - global define bootable (list region) ``{ + global define can_create_logical (list partitions, integer first_logical, + integer max_logical ) ``{ global define can_resize( list partitions ) ``{ global define renumber_logical_partitions (list partitions) ``{ global define unused_extended_region (list partitions) ``{ @@ -202,24 +202,16 @@ // Check whether three logical partitions can be created without // running past the kernel limit for the number of partitions -define boolean can_create_logical( list<map> partitions ) +define boolean can_create_logical( list<map> partitions, + integer first_logical_nr, + integer max_logical ) ``{ list logicals = filter( map pentry, partitions, ``(pentry["type"]:`unknown == `logical)); integer num_logical = size (logicals); - return ((first_logical_nr + num_logical + 3) <= (max_partitions + 1)); + return ((first_logical_nr + num_logical + 2) <= max_logical); }; - // Check whether the boot partition is located entrely below the bootable - // cylinder limit - -define boolean bootable(list<integer> region, integer bps) - ``{ - return( start_of_region(region) + size_to_units(size_of_boot,bps) < - Partitions::BootCyl() ); - }; - - // Check if the given partition is a FAT partition // Input: partition map to be checked (from targets) // Return: true if partition is FAT, false otherwise Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto_part_prepare.ycp?rev=42158&r1=42157&r2=42158&view=diff ============================================================================== --- trunk/storage/storage/src/include/auto_part_prepare.ycp (original) +++ trunk/storage/storage/src/include/auto_part_prepare.ycp Mon Nov 19 12:51:52 2007 @@ -77,7 +77,7 @@ // check if this is enough if( (size_of_region(unused_region,bytes_per_unit) > required_size) && - can_create_logical (partitions)) + can_create_logical (partitions,5,target["max_logical"]:15)) can_do_auto = true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org