Author: fehr Date: Mon Jan 9 16:41:07 2012 New Revision: 67130 URL: http://svn.opensuse.org/viewcvs/yast?rev=67130&view=rev Log: do not enforce subvolumes to start with "@/" on openSuSE (bnc#738542) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=67130&r1=67129&r2=67130&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Mon Jan 9 16:41:07 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jan 9 16:39:46 CET 2012 - fehr@suse.de + +- do not enforce subvolumes to start with "@/" on openSuSE + (bnc#738542) + +------------------------------------------------------------------- Tue Jan 03 11:59:51 CET 2012 - aschnell@suse.de - removed generating fstab entries for ZIP drives Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/custom_part_dialogs.ycp?rev=67130&r1=67129&r2=67130&view=diff ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Mon Jan 9 16:41:07 2012 @@ -1401,15 +1401,17 @@ if( ret == `add ) { string pth = (string)UI::QueryWidget( `id(`new_path), `Value ); - y2milestone( "SubvolHandling add path:%1", pth ); + string svtmp = FileSystems::default_subvol + "/"; + y2milestone( "SubvolHandling add path:%1 svtmp:%2", pth, svtmp ); y2milestone( "SubvolHandling names:%1", SubvolNames( new ) ); if( pth==nil || size(pth)==0 ) Popup::Message(_("Empty subvolume name not allowed.")); - else if( substring( pth, 0, 2 )!="@/" ) + else if( size(FileSystems::default_subvol)>0 && + substring( pth, 0, size(svtmp) )!=svtmp ) { - Popup::Message( _("Only subvolume names starting with \"@/\" currently allowed! -Automatically prepending \"@/\" to name of subvolume.")); - pth = "@/" + pth; + string tmp = sformat( _("Only subvolume names starting with \"%1\" currently allowed! +Automatically prepending \"%1\" to name of subvolume."), svtmp ); + Popup::Message( tmp ); } if( contains( SubvolNames( new ), pth )) Popup::Message(sformat(_("Subvolume name %1 already exists."),pth)); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org