Author: aschnell Date: Fri May 15 12:50:31 2009 New Revision: 57194 URL: http://svn.opensuse.org/viewcvs/yast?rev=57194&view=rev Log: - handle autodetect flag at more places Modified: trunk/storage/libstorage/src/Storage.cc Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.cc?rev=57194&r1=57193&r2=57194&view=diff ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Fri May 15 12:50:31 2009 @@ -378,7 +378,7 @@ addToList( new MdCo( this, file ) ); } } - else + else if (autodetect() && getenv("YAST2_STORAGE_NO_MD") == NULL) { MdCo * v = new MdCo( this, true ); if( !v->isEmpty() ) @@ -398,7 +398,7 @@ addToList( new LoopCo( this, file ) ); } } - else + else if (autodetect() && getenv("YAST2_STORAGE_NO_LOOP") == NULL) { LoopCo * v = new LoopCo( this, true, ppart ); if( !v->isEmpty() ) @@ -420,7 +420,7 @@ addToList( new NfsCo( this, file ) ); } } - else + else if (autodetect() && getenv("YAST2_STORAGE_NO_NFS") == NULL) { NfsCo * v = new NfsCo(this, fstab, mounts); if( !v->isEmpty() ) @@ -443,7 +443,7 @@ } globfree (&globbuf); } - else if( getenv( "YAST2_STORAGE_NO_LVM" )==NULL ) + else if (autodetect() && getenv("YAST2_STORAGE_NO_LVM") == NULL) { list<string> l; LvmVg::getVgs( l ); @@ -478,7 +478,7 @@ } globfree (&globbuf); } - else if( getenv( "YAST2_STORAGE_NO_DMRAID" )==NULL ) + else if (autodetect() && getenv("YAST2_STORAGE_NO_DMRAID") == NULL) { list<string> l; DmraidCo::getRaids(l); @@ -519,7 +519,7 @@ } globfree (&globbuf); } - else if( getenv( "YAST2_STORAGE_NO_DMMULTIPATH" )==NULL ) + else if (autodetect() && getenv("YAST2_STORAGE_NO_DMMULTIPATH") == NULL) { list<string> l; DmmultipathCo::getMultipaths(l); @@ -561,7 +561,7 @@ } globfree (&globbuf); } - else if( getenv( "YAST2_STORAGE_NO_DM" )==NULL ) + else if (autodetect() && getenv("YAST2_STORAGE_NO_DM") == NULL) { DmCo * v = new DmCo( this, true, ppart ); if( !v->isEmpty() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org