Author: fehr Date: Thu Sep 13 14:38:09 2007 New Revision: 40889 URL: http://svn.opensuse.org/viewcvs/yast?rev=40889&view=rev Log: change activation of md devices (#309841) Modified: trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/MdCo.h trunk/storage/libstorage/src/Storage.cc trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/modules/StorageControllers.ycp Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?rev=40889&r1=40888&r2=40889&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Thu Sep 13 14:38:09 2007 @@ -538,15 +538,21 @@ return( ret ); } -void MdCo::activate( bool val ) +void MdCo::activate( bool val, const string& tmpDir ) { - y2milestone( "old active:%d val:%d", active, val ); + y2milestone( "old active:%d val:%d tmp:%s", active, val, tmpDir.c_str() ); if( active!=val ) { SystemCmd c; if( val ) { - c.execute( "raidautorun" ); + string mdconf = tmpDir + "/mdadm.conf"; + string cmd = "echo 1 > /sys/module/md_mod/parameters/start_ro"; + c.execute( cmd ); + cmd = "mdadm --examine --scan --config=partitions >" + mdconf; + c.execute( cmd ); + cmd = "mdadm --assemble --scan --config=" + mdconf; + c.execute( cmd ); } else { @@ -625,7 +631,7 @@ if( m != NULL ) { if( !active ) - activate(true); + activate(true, getStorage()->tmpDir()); if( !silent ) { getStorage()->showInfoCb( m->removeText(true) ); Modified: trunk/storage/libstorage/src/MdCo.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.h?rev=40889&r1=40888&r2=40889&view=diff ============================================================================== --- trunk/storage/libstorage/src/MdCo.h (original) +++ trunk/storage/libstorage/src/MdCo.h Thu Sep 13 14:38:09 2007 @@ -37,7 +37,7 @@ void syncRaidtab(); void changeDeviceName( const string& old, const string& nw ); - static void activate( bool val=true ); + static void activate( bool val, const string& tmpDir ); int removeVolume( Volume* v ); protected: Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=40889&r1=40888&r2=40889&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Thu Sep 13 14:38:09 2007 @@ -233,7 +233,7 @@ detectDisks( *ppart ); if( instsys() ) { - MdCo::activate( true ); + MdCo::activate( true, tmpDir() ); LvmVg::activate( true ); DmraidCo::activate( true ); delete ppart; @@ -6149,14 +6149,14 @@ if( val ) { Dm::activate(val); - MdCo::activate(val); + MdCo::activate(val,tmpDir()); } LvmVg::activate(val); EvmsCo::activate(val); if( !val ) { Dm::activate(val); - MdCo::activate(val); + MdCo::activate(val,tmpDir()); } } Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.changes?rev=40889&r1=40888&r2=40889&view=diff ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Sep 13 14:38:09 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 13 12:54:38 CEST 2007 - fehr@suse.de + +- change activation of md devices (#309841) + +------------------------------------------------------------------- Tue Sep 11 12:23:42 CEST 2007 - fehr@suse.de - fix path creation on loop based files (#308995) Modified: trunk/storage/storage/src/modules/StorageControllers.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageControllers.ycp?rev=40889&r1=40888&r2=40889&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageControllers.ycp (original) +++ trunk/storage/storage/src/modules/StorageControllers.ycp Thu Sep 13 14:38:09 2007 @@ -604,9 +604,6 @@ SCR::Execute(.target.modprobe, "raid6", "" ); SCR::Execute(.target.modprobe, "multipath", "" ); - // init sw-RAID subsystem in the kernel - SCR::Execute( .target.bash, "/sbin/raidautorun"); - StartHotplugStorage(); y2milestone("Initialize all controllers initialized module_loaded:%1", -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org