Author: aschnell Date: Thu Oct 30 11:37:12 2008 New Revision: 52727 URL: http://svn.opensuse.org/viewcvs/yast?rev=52727&view=rev Log: - check minimal size of volume for file system Modified: trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/include/ep-hd-dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_lib.ycp?rev=52727&r1=52726&r2=52727&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Oct 30 11:37:12 2008 @@ -469,45 +469,29 @@ } -define boolean check_ok_fssize( integer siz, map part ) - ``{ +boolean +check_ok_fssize(integer size_k, map volume) +{ boolean ret = true; - if( part["format"]:false ) - { - symbol fs = part["used_fs"]:`unknown; - integer min_size = FileSystems::MinFsSizeK( fs ) * 1024; - y2milestone( "check_ok_fssize fs:%1 size:%2", fs, min_size ); - if( fs==`reiser && sizhttp://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-dialogs.ycp?rev=52727&r1=52726&r2=52727&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Oct 30 11:37:12 2008 @@ -302,7 +302,17 @@ { if (ret_mp["field"]:`none != `none) UI::SetFocus(`id(ret_mp["field"]:`none)); + widget = `again; + continue; + } + } + + if (do_format) + { + if (!check_ok_fssize(data["size_k"]:0, data)) + { widget = `again; + continue; } } Modified: trunk/storage/storage/src/include/ep-hd-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-hd-dialogs.ycp?rev=52727&r1=52726&r2=52727&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-hd-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-hd-dialogs.ycp Thu Oct 30 11:37:12 2008 @@ -247,6 +247,8 @@ } } + data["size_k"] = Region::Length(data["region"]:[0, 0]) * cyl_size / 1024; + if (data["type"]:`unknown == `extended) { widget = `finish; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org