[yast-commit] r60353 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-lib.ycp

Author: aschnell Date: Wed Jan 13 19:25:27 2010 New Revision: 60353 URL: http://svn.opensuse.org/viewcvs/yast?rev=60353&view=rev Log: - fixed importing mount points for cases where the proposal has deleted partitions (bnc #463327) Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-lib.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=60353&r1=60352&r2=60353&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Wed Jan 13 19:25:27 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Jan 13 18:40:58 CET 2010 - aschnell@suse.de + +- fixed importing mount points for cases where the proposal has + deleted partitions (bnc #463327) + +------------------------------------------------------------------- Wed Jan 13 14:54:47 CET 2010 - fehr@suse.de - set fs to detected fs when format is set to false to prevent Modified: trunk/storage/storage/src/include/ep-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-lib.ycp?rev=60353&r1=60352&r2=60353&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-lib.ycp Wed Jan 13 19:25:27 2010 @@ -273,19 +273,20 @@ void ImportMountPoints() { - map od = (map)Storage::GetOndiskTarget(); - list<list> fstab = scanAndReadExistingFstab( od ); + Storage::CreateTargetBackup("import"); + Storage::ResetOndiskTarget(); + + map target_map = Storage::GetOndiskTarget(); + list<list> fstab = scanAndReadExistingFstab(target_map); y2milestone( "adapt_mp fstab %1", fstab ); - list ti = maplist( list e, fstab, ``(AddFstabToData( od, (list<map>)e)[1]:$[])); + list ti = maplist( list e, fstab, ``(AddFstabToData( target_map, (list<map>)e)[1]:$[])); y2milestone( "adapt_mp ti %1", ti ); integer idx = FstabAddDialog( ti ); if( idx>=0 ) { - od = (map)Storage::GetOndiskTarget(); y2milestone( "adapt_mp use fstab idx %1", idx ); - ti = AddFstabToData( od, (list<map>)fstab[idx]:[] ); - Storage::ResetOndiskTarget(); + ti = AddFstabToData( target_map, (list<map>)fstab[idx]:[] ); foreach( string d, map disk, ti[0]:$[], ``{ foreach( map p, disk["partitions"]:[], @@ -299,7 +300,13 @@ } }); }); + Storage::SetTargetMap(ti[0]:$[]); + Storage::DisposeTargetBackup("import"); + } + else + { + Storage::RestoreTargetBackup("import"); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org