Author: fehr Date: Wed Aug 10 16:37:08 2011 New Revision: 65301 URL: http://svn.opensuse.org/viewcvs/yast?rev=65301&view=rev Log: enforce that all subvolume names starting with "@/" Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes?rev=65301&r1=65300&r2=65301&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Wed Aug 10 16:37:08 2011 @@ -1,9 +1,10 @@ ------------------------------------------------------------------- -Wed Aug 10 14:59:41 CEST 2011 - fehr@suse.de +Wed Aug 10 16:36:17 CEST 2011 - fehr@suse.de - allow label on btrfs when format is true - do not allow to partition disks used by LVM in disk selection - show popup if proposal of separate /home is not possible +- enforce that all subvolume names starting with "@/" ------------------------------------------------------------------- Tue Aug 9 16:29:08 CEST 2011 - fehr@suse.de Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp?rev=65301&r1=65300&r2=65301&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/include/custom_part_dialogs.ycp Wed Aug 10 16:37:08 2011 @@ -1370,7 +1370,13 @@ y2milestone( "SubvolHandling names:%1", SubvolNames( new ) ); if( pth==nil || size(pth)==0 ) Popup::Message(_("Empty subvolume name not allowed.")); - else if( contains( SubvolNames( new ), pth )) + else if( substring( pth, 0, 2 )!="@/" ) + { + Popup::Message( _("Only subvolume names starting with \"@/\" currently allowed! +Automatically prepending \"@/\" to name of subvolume.")); + pth = "@/" + pth; + } + if( contains( SubvolNames( new ), pth )) Popup::Message(sformat(_("Subvolume name %1 already exists."),pth)); else { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org