Author: fehr Date: Tue Oct 18 13:52:11 2011 New Revision: 66478 URL: http://svn.opensuse.org/viewcvs/yast?rev=66478&view=rev Log: prevent missing swap entry in fstab when swap already active at start of installation (bnc#724785) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc?rev=66478&r1=66477&r2=66478&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Volume.cc Tue Oct 18 13:52:11 2011 @@ -385,7 +385,7 @@ { found = fstabData.findMount( mp, entry ); } - if (!found && !mp.empty()) + if (!found && !mp.empty() && (mp!="swap"||!getStorage()->instsys()) ) { setIgnoreFstab(true); } 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=66478&r1=66477&r2=66478&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 Tue Oct 18 13:52:11 2011 @@ -1,6 +1,8 @@ ------------------------------------------------------------------- Tue Oct 18 11:25:59 CEST 2011 - fehr@suse.de +- prevent missing swap entry in fstab when swap already active at + start of installation (bnc#724785) - fix typo in error message (bnc#724771) ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org