Author: fehr Date: Mon Sep 19 12:21:53 2011 New Revision: 65784 URL: http://svn.opensuse.org/viewcvs/yast?rev=65784&view=rev Log: fix bug that prevent mounting by-id and by-path for BTRFS volumes (bnc#718717) 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=65784&r1=65783&r2=65784&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 Mon Sep 19 12:21:53 2011 @@ -269,14 +269,15 @@ switch (mby) { case MOUNTBY_PATH: - if (cType() != DISK) + if (cType() != DISK && cType() != BTRFSC ) ret = false; if (udevPath().empty()) ret = false; break; case MOUNTBY_ID: - if (cType() != DISK && cType() != DMRAID && cType() != DMMULTIPATH && cType() != MD && cType() != MDPART) + if (cType() != DISK && cType() != DMRAID && cType() != DMMULTIPATH && + cType() != MD && cType() != MDPART && cType() != BTRFSC ) ret = false; if (udevId().empty() && cType() != MD) ret = false; 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=65784&r1=65783&r2=65784&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 Mon Sep 19 12:21:53 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Sep 19 12:18:31 CEST 2011 - fehr@suse.de + +- fix bug that prevent mounting by-id and by-path for BTRFS volumes + (bnc#718717) + +------------------------------------------------------------------- Wed Sep 7 16:47:34 CEST 2011 - fehr@suse.de - version 2.17.114 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org