Author: aschnell Date: Fri Mar 19 17:41:23 2010 New Revision: 61406 URL: http://svn.opensuse.org/viewcvs/yast?rev=61406&view=rev Log: - fixed iSCSI disk detection (bnc #589743) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc?rev=61406&r1=61405&r2=61406&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Disk.cc Fri Mar 19 17:41:23 2010 @@ -386,16 +386,20 @@ mjr = sysfsinfo.mjr; mnr = sysfsinfo.mnr; - if (boost::contains(sysfsinfo.device, "/session")) - iscsi = true; + string link; + if (readlink(sysfs_dir, link)) + { + y2mil("link:" << link); + iscsi = boost::contains(link, "/session"); + } } else { ret = false; } - y2mil("ret:" << ret << " range:" << range << " major:" << mjr << " minor:" << mnr << - " iscsi:" << iscsi); + y2mil("dev:" << dev << " ret:" << ret << " range:" << range << " major:" << mjr << + " minor:" << mnr << " iscsi:" << iscsi); return ret; } 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=61406&r1=61405&r2=61406&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 19 17:41:23 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Mar 19 17:40:24 CET 2010 - aschnell@suse.de + +- fixed iSCSI disk detection (bnc #589743) + +------------------------------------------------------------------- Fri Mar 12 12:03:45 CET 2010 - aschnell@suse.de - fixed XEN disk detection (bnc #587658) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org