Author: aschnell Date: Fri Mar 5 16:33:47 2010 New Revision: 61171 URL: http://svn.opensuse.org/viewcvs/yast?rev=61171&view=rev Log: - fixed member entry in mdadm.conf for IMSM (bnc #576498) Modified: branches/SuSE-Code-11-SP1-Branch/storage/VERSION 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/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/VERSION?rev=61171&r1=61170&r2=61171&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/VERSION Fri Mar 5 16:33:47 2010 @@ -1 +1 @@ -2.17.93 +2.17.94 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=61171&r1=61170&r2=61171&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 Fri Mar 5 16:33:47 2010 @@ -1355,6 +1355,7 @@ parent_md_name = rhs.parent_md_name; parent_metadata = rhs.parent_metadata; parent_uuid = rhs.parent_uuid; + md_metadata = rhs.md_metadata; md_uuid = rhs.md_uuid; sb_ver = rhs.sb_ver; destrSb = rhs.destrSb; @@ -1479,7 +1480,7 @@ void MdPartCo::getMdProps() { - y2mil("Called"); + y2mil("Called dev:" << dev); string property; @@ -1487,6 +1488,7 @@ { y2war("Failed to read metadata"); } + y2mil("md_metadata:" << md_metadata); property.clear(); if( !readProp(COMPONENT_SIZE, property) ) @@ -1539,12 +1541,13 @@ md_type = toMdType(property); } - // setMdParity(); setMdDevs(); setSpares(); setMetaData(); MdPartCo::getUuidName(nm,md_uuid,md_name); + + y2mil("md_metadata:" << md_metadata); if( has_container ) { MdPartCo::getUuidName(parent_container,parent_uuid,parent_md_name); @@ -1675,12 +1678,11 @@ } string path = sysfs_path + parent_container + "/md/" + md_props[METADATA]; - string val; - if( access( path.c_str(), R_OK )==0 ) { std::ifstream file( path.c_str() ); classic(file); + string val; file >> val; file.close(); file.clear(); @@ -1693,7 +1695,6 @@ parent_metadata = sb_ver; } } - return; } void MdPartCo::setMdParity() 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=61171&r1=61170&r2=61171&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 Fri Mar 5 16:33:47 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Mar 05 16:32:25 CET 2010 - aschnell@suse.de + +- fixed member entry in mdadm.conf for IMSM (bnc #576498) +- 2.17.94 + +------------------------------------------------------------------- Wed Mar 03 11:28:56 CET 2010 - aschnell@suse.de - wait for device before zeroing it (bnc #584683) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org