Author: aschnell Date: Wed Dec 2 15:26:01 2009 New Revision: 59894 URL: http://svn.opensuse.org/viewcvs/yast?rev=59894&view=rev Log: - cleanup Modified: trunk/storage/storage/src/include/auto_part_prepare.ycp trunk/storage/storage/src/inst_target_part.ycp 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=59894&r1=59893&r2=59894&view=diff ============================================================================== --- trunk/storage/storage/src/include/auto_part_prepare.ycp (original) +++ trunk/storage/storage/src/include/auto_part_prepare.ycp Wed Dec 2 15:26:01 2009 @@ -26,7 +26,8 @@ y2milestone( "prepare_partitions bytes_per_unit: %1 disk_size:%2", bytes_per_unit, disk_size ); - size_of_boot = Partitions::MinimalNeededBootsize(); + integer size_of_boot = Partitions::MinimalNeededBootsize(); + integer size_of_swap = 1024 * 1024 * Partitions::SwapSizeMb(0); // The minimum size needed to install a default system integer required_size = 1500 * 1024 * 1024 + size_of_boot + size_of_swap; Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_part.ycp?rev=59894&r1=59893&r2=59894&view=diff ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Wed Dec 2 15:26:01 2009 @@ -43,8 +43,6 @@ // The partition number of the first logical partition integer first_logical_nr = 5; - integer size_of_swap = 0; - integer size_of_boot = 0; integer max_primary = 0; // this will tell if automatic partitioning if feasible boolean can_do_auto = false; @@ -126,13 +124,6 @@ max_partitions = compute_max_partitions(target); - // How much to allocate for swap - size_of_swap = 1024*1024*Partitions::SwapSizeMb(0); - - // -------------------------------------------------------------- - // set size of /boot partition - size_of_boot = Partitions::MinimalNeededBootsize(); - // The number of possible primary partitions max_primary = target["max_primary"]:4; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org