Author: aschnell Date: Wed Jan 27 15:35:19 2010 New Revision: 60557 URL: http://svn.opensuse.org/viewcvs/yast?rev=60557&view=rev Log: - and avoid IMSM popup Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc?rev=60557&r1=60556&r2=60557&view=diff ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Wed Jan 27 15:35:19 2010 @@ -516,6 +516,8 @@ y2mil(" md raids:" + mdDevs); if( !mdDevs.empty()) { + if (getImsmDriver() == IMSM_UNDECIDED) + { string txt = sformat( // popup text %1$s is replaced by disk name e.g. /dev/hda _("You are running on the Intel(R) Matrix Storage Manager compatible platform.\n" @@ -538,7 +540,12 @@ ret = false; setImsmDriver(IMSM_DMRAID); } - } + } + else + { + ret = getImsmDriver() == IMSM_MDADM; + } + } else { /* No mdDevs */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org