Author: fehr Date: Thu Feb 28 17:02:02 2008 New Revision: 45104 URL: http://svn.opensuse.org/viewcvs/yast?rev=45104&view=rev Log: do not allow mp swap for file based loop devices (#363332) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=45104&r1=45103&r2=45104&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Feb 28 17:02:02 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 28 17:01:31 CET 2008 - fehr@suse.de + +- do not allow mp swap for file based loop devices (#363332) + +------------------------------------------------------------------- Mon Feb 25 17:40:54 CET 2008 - fehr@suse.de - ignore EVMS containers with erroneous devices (#360075) 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=45104&r1=45103&r2=45104&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Feb 28 17:02:02 2008 @@ -372,13 +372,15 @@ ``{ string mount = part["mount"]:""; symbol used_fs = part["used_fs"]:`unknown; + y2milestone( "check_mount_point part:%1", part ); boolean allowed = true; list not_allowed_system_mount_points = [ "/proc", "/dev", "/mnt", "/var/adm/mnt", "/lost+found", "/lib", "/bin", "/etc", "/sbin" ]; - if ( mount != "" && mount != "swap" ) + if( mount != "" && + (mount != "swap" || part["type"]:`unknown==`loop) ) { // check if the mount point is already in use foreach( string disk, map diskinfo, targetMap, ``{ @@ -391,7 +393,7 @@ }); }); - if( allowed == false ) + if( allowed == false && mount!="swap" ) { // error popup text Popup::Error(_("This mount point is already in use. Select a different one.")); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org