Author: aschnell Date: Fri Feb 19 13:58:48 2010 New Revision: 60877 URL: http://svn.opensuse.org/viewcvs/yast?rev=60877&view=rev Log: - allow setting of imsm_driver via env.var. (bnc #574270) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes 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/storag... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Fri Feb 19 13:58:48 2010 @@ -106,18 +106,19 @@ Storage::Storage(const Environment& env) - : env(env), lock(readonly(), testmode()), initialized(false) + : env(env), lock(readonly(), testmode()), initialized(false), fstab(NULL), raidtab(NULL), + imsm_driver(IMSM_UNDECIDED) { y2mil("constructed Storage with " << env); y2mil("package string \"" PACKAGE_STRING "\""); - char * tenv = getenv( "YAST_IS_RUNNING" ); + root_mounted = !instsys(); efiboot = false; hald_pid = 0; max_log_num = 5; - tenv = getenv( "Y2MAXLOGNUM" ); - if( tenv!=0 ) + const char* tenv = getenv("Y2MAXLOGNUM"); + if (tenv) string(tenv) >> max_log_num; y2mil("max_log_num:" << max_log_num); @@ -132,10 +133,14 @@ defaultMountBy = MOUNTBY_ID; detectMounted = true; - fstab = NULL; - raidtab = NULL; - - imsm_driver = IMSM_UNDECIDED; + tenv = getenv("LIBSTORAGE_IMSM_DRIVER"); + if (tenv) + { + if (boost::iequals(tenv, "DMRAID", locale::classic())) + imsm_driver = IMSM_DMRAID; + else if (boost::iequals(tenv, "MDADM", locale::classic())) + imsm_driver = IMSM_MDADM; + } logSystemInfo(); } 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/storag... ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Fri Feb 19 13:58:48 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri Feb 19 13:52:42 CET 2010 - aschnell@suse.de + +- allow setting of imsm_driver via env.var. (bnc #574270) + +------------------------------------------------------------------- Mon Feb 08 14:03:47 CET 2010 - aschnell@suse.de - do not allow deletion of partitions on DASD when other partitions -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org