Author: aschnell Date: Thu Feb 4 12:00:56 2010 New Revision: 60688 URL: http://svn.opensuse.org/viewcvs/yast?rev=60688&view=rev Log: - fixed writing of mdadm.conf (bnc #565207) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc?rev=60688&r1=60687&r2=60688&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Md.cc Thu Feb 4 12:00:56 2010 @@ -49,6 +49,7 @@ y2err("constructed md with wrong container"); init(); md_type = Type; + has_container = false; for( list<string>::const_iterator i=devices.begin(); i!=devices.end(); ++i ) devs.push_back( normalizeDevice( *i ) ); computeSize(); @@ -733,6 +734,15 @@ destrSb = rhs.destrSb; devs = rhs.devs; spare = rhs.spare; + + has_container = rhs.has_container; + md_metadata = rhs.md_metadata; + parent_container = rhs.parent_container; + parent_uuid = rhs.parent_uuid; + parent_md_name = rhs.parent_md_name; + parent_metadata = rhs.parent_metadata; + md_member = rhs.md_member; + return( *this ); } @@ -799,10 +809,10 @@ info.md_uuid = md_uuid; if( has_container ) { - stringstream ss; info.container_present = true; info.container_info.md_uuid = parent_uuid; info.container_info.metadata = parent_metadata; + stringstream ss; ss << md_member; info.member = ss.str(); } Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc?rev=60688&r1=60687&r2=60688&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Thu Feb 4 12:00:56 2010 @@ -1364,13 +1364,10 @@ md_parity = rhs.md_parity; md_state = rhs.md_state; has_container = rhs.has_container; - if( has_container ) - { parent_container = rhs.parent_container; parent_md_name = rhs.parent_md_name; parent_metadata = rhs.parent_metadata; parent_uuid = rhs.parent_uuid; - } md_uuid = rhs.md_uuid; sb_ver = rhs.sb_ver; destrSb = rhs.destrSb; 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=60688&r1=60687&r2=60688&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 Feb 4 12:00:56 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Feb 04 11:59:56 CET 2010 - aschnell@suse.de + +- fixed writing of mdadm.conf (bnc #565207) + +------------------------------------------------------------------- Wed Jan 27 15:09:27 CET 2010 - aschnell@suse.de - allow to set driver for IMSM without callback (bnc #574270) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org