Author: fehr Date: Thu Mar 25 11:45:50 2010 New Revision: 61489 URL: http://svn.opensuse.org/viewcvs/yast?rev=61489&view=rev Log: fix bug when using mount-by-UUID for swap (bnc #591061) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc?rev=61489&r1=61488&r2=61489&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Volume.cc Thu Mar 25 11:45:50 2010 @@ -135,8 +135,6 @@ mb = MOUNTBY_DEVICE; if (cType() == NFSC && mb != MOUNTBY_DEVICE) mb = MOUNTBY_DEVICE; - if( mp=="swap" && mb==MOUNTBY_UUID ) - mb = MOUNTBY_DEVICE; y2mil( "path:" << udevPath() << " id:" << udevId() ); if( (mb==MOUNTBY_PATH && udevPath().empty()) || (mb==MOUNTBY_ID && udevId().empty()) ) @@ -156,8 +154,6 @@ bool ret = true; if ((cType() != DISK && cType() != DMRAID && cType() != DMMULTIPATH) && (mby == MOUNTBY_ID || mby == MOUNTBY_PATH)) ret = false; - if (mp == "swap" && mby == MOUNTBY_UUID) - ret = false; if (cType() == NFSC && mby != MOUNTBY_DEVICE) ret = false; if( (mby==MOUNTBY_PATH && udevPath().empty()) || @@ -869,14 +865,14 @@ { format = false; detected_fs = fs; - if( fs != SWAP && !cont->getStorage()->testmode() ) + if( !cont->getStorage()->testmode() ) { FsType old=fs; updateFsData(); if( fs != old ) ret = VOLUME_FORMAT_FS_UNDETECTED; } - else if( fs != SWAP ) + else { uuid = "testmode-0123-4567-6666-98765432"+decString(fcount++); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes?rev=61489&r1=61488&r2=61489&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Thu Mar 25 11:45:50 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 25 11:20:52 CET 2010 - fehr@suse.de + +- fix bug when using mount-by-UUID for swap (bnc #591061) + +------------------------------------------------------------------- Mon Mar 22 17:15:01 CET 2010 - aschnell@suse.de - fixed DEVICE line in mdadm.conf (bnc #590237) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org