Author: aschnell Date: Thu Sep 23 12:37:33 2010 New Revision: 62501 URL: http://svn.opensuse.org/viewcvs/yast?rev=62501&view=rev Log: - do not allow resizing of VFAT on logical volumes - stricter types Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.cha... ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Sep 23 12:37:33 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 23 12:33:40 CEST 2010 - aschnell@suse.de + +- do not allow resizing of VFAT on logical volumes + +------------------------------------------------------------------- Mon Sep 13 14:36:20 CEST 2010 - fehr@suse.de - add helptext for partition alignment (bnc#637223) Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-di... ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Sep 23 12:37:33 2010 @@ -585,7 +585,7 @@ map<string, map> target_map = Storage::GetTargetMap(); - map possible = Storage::IsResizable(data); + map<string, boolean> possible = Storage::IsResizable(data); if (!data["format"]:false && !possible["shrink"]:false && !possible["extend"]:false) { // popup text Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stora... ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Sep 23 12:37:33 2010 @@ -4838,9 +4838,9 @@ * @param map partition * @return map resizable ? */ -global define map IsResizable( map part ) - ``{ - map ret = FileSystems::IsResizable(`unknown); +global map<string, boolean> IsResizable(map<string, any> part) + { + map<string, boolean> ret = FileSystems::IsResizable(`unknown); if ((!Arch::s390() && Partitions::IsResizable(part["fsid"]:0)) || part["type"]:`none == `lvm) { @@ -4850,7 +4850,8 @@ } else { - ret = FileSystems::IsResizable(part["used_fs"]:`unknown); + if (!(part["type"]:`none == `lvm && part["used_fs"]:`unknown == `vfat)) + ret = FileSystems::IsResizable(part["used_fs"]:`unknown); } } y2milestone( "IsResizable part:%1 ret:%2", part, ret ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org