Author: fehr Date: Wed Oct 26 13:27:24 2011 New Revision: 66601 URL: http://svn.opensuse.org/viewcvs/yast?rev=66601&view=rev Log: make /dev/md/ names known to libstorage if present (bnc#726319) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.cc?rev=66601&r1=66600&r2=66601&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.cc Wed Oct 26 13:27:24 2011 @@ -610,6 +610,11 @@ return links; } +map getDirLinks(const string& dir) + { + return( getUdevLinks(dir.c_str()) ); + } + UdevMap::UdevMap(const string& path) { Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.h?rev=66601&r1=66600&r2=66601&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/AppUtil.h Wed Oct 26 13:27:24 2011 @@ -72,6 +72,8 @@ string udevEncode(const string&); string udevDecode(const string&); + map getDirLinks(const string& dir); + bool mkdtemp(string& path); bool readlink(const string& path, string& buf); Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc?rev=66601&r1=66600&r2=66601&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Md.cc Wed Oct 26 13:27:24 2011 @@ -199,6 +199,12 @@ alt_names.remove_if(string_starts_with("/dev/disk/by-id/")); for (list<string>::const_iterator i = udev_id.begin(); i != udev_id.end(); ++i) alt_names.push_back("/dev/disk/by-id/" + *i); + alt_names.remove_if(string_starts_with("/dev/md/")); + map md = getDirLinks("/dev/md"); + y2mil("links:" << md ); + for( map::const_iterator i=md.begin(); i!=md.end(); ++i ) + if(i->second==nm) + alt_names.push_back("/dev/md/"+i->first); } 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=66601&r1=66600&r2=66601&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 Wed Oct 26 13:27:24 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Oct 26 13:17:43 CEST 2011 - fehr@suse.de + +- make /dev/md/ names known to libstorage if present (bnc#726319) + +------------------------------------------------------------------- Tue Oct 25 16:08:52 CEST 2011 - fehr@suse.de - version 2.17.118 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org