January 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55125 - /trunk/installation/src/clients/inst_finish.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 16:20:54 2009 New Revision: 55125 URL: http://svn.opensuse.org/viewcvs/yast?rev=55125&view=rev Log: Some more SlideShow Modified: trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 16:20:54 2009 @@ -337,7 +337,9 @@ foreach (map step, stage["steps"]:[], { current_step = current_step + 1; + SlideShow::SubProgress (100 * current_step / steps_nr, nil); SlideShow::StageProgress (current_stage_percent + (100 / stages_nr * current_step / steps_nr), nil); + if (haskey (step, "title")) { // use as ' * %1' -> ' * One of the finish steps...' in the SlideShow log SlideShow::AppendMessageToInstLog (sformat (_(" * %1"), step["title"]:"")); @@ -366,8 +368,11 @@ SlideShow::HandleInput (user_ret); } }); + if (aborted) break; + + SlideShow::SubProgress (100, nil); }); SlideShow::StageProgress (100, _("Finished")); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55124 - /trunk/installation/package/yast2-installation.changes
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 16:00:50 2009 New Revision: 55124 URL: http://svn.opensuse.org/viewcvs/yast?rev=55124&view=rev Log: - Better SlideShow support in inst_finish. - Reporting more errors in inst_finish. Modified: trunk/installation/package/yast2-installation.changes Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Wed Jan 28 16:00:50 2009 @@ -3,6 +3,8 @@ - Added new InstError module for unified reporting of errors during installation. +- Better SlideShow support in inst_finish. +- Reporting more errors in inst_finish. - 2.18.3 ------------------------------------------------------------------- -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55123 - /trunk/installation/src/clients/inst_finish.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 15:51:48 2009 New Revision: 55123 URL: http://svn.opensuse.org/viewcvs/yast?rev=55123&view=rev Log: Handling also SlideShow-related user input Modified: trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 15:51:48 2009 @@ -352,10 +352,18 @@ } Progress::set (orig); - if (UI::PollInput () == `abort && Popup::ConfirmAbort (`incomplete)) - { - aborted = true; - break; + // Handle user input during client run + any user_ret = UI::PollInput (); + + // Aborting...? + if (user_ret == `abort) { + if (Popup::ConfirmAbort (`incomplete)) { + aborted = true; + break; + } + // Anything else + } else { + SlideShow::HandleInput (user_ret); } }); if (aborted) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55122 - /tags/stable-2_18_3/libyui/
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 15:46:21 2009 New Revision: 55122 URL: http://svn.opensuse.org/viewcvs/yast?rev=55122&view=rev Log: Created tag stable-2_18_3 for libyui Added: tags/stable-2_18_3/libyui/ - copied from r55121, trunk/libyui/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55121 - /tags/stable-2_18_3/
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 15:46:20 2009 New Revision: 55121 URL: http://svn.opensuse.org/viewcvs/yast?rev=55121&view=rev Log: Created tag stable-2_18_3 Added: tags/stable-2_18_3/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55120 - /tags/stable-2_18_2/storage/
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 15:38:06 2009 New Revision: 55120 URL: http://svn.opensuse.org/viewcvs/yast?rev=55120&view=rev Log: Created tag stable-2_18_2 for storage Added: tags/stable-2_18_2/storage/ (props changed) - copied from r55119, trunk/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55119 - in /trunk/installation/src: clients/inst_finish.ycp modules/InstError.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 15:20:01 2009 New Revision: 55119 URL: http://svn.opensuse.org/viewcvs/yast?rev=55119&view=rev Log: Some more tiny fixes Modified: trunk/installation/src/clients/inst_finish.ycp trunk/installation/src/modules/InstError.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 15:20:01 2009 @@ -29,6 +29,7 @@ import "ProductFeatures"; import "SlideShow"; import "InstError"; + import "PackageCallbacks"; // added for fate# 303395 import "Directory"; @@ -36,11 +37,11 @@ if (GetInstArgs::going_back()) return `auto; - boolean test_mode = false; + // --> Functions void ReportClientError (string client_error_text) { // get the latest errors - map cmd = (map) WFM::Execute (.local.bash_output, "tail -n 200 /var/log/YaST2/y2log | grep ' <$3\|5$> '"); + map cmd = (map) WFM::Execute (.local.bash_output, "tail -n 200 /var/log/YaST2/y2log | grep ' <\$3\\|5\$> '"); InstError::ShowErrorPopUp ( _("Installation Error"), @@ -49,6 +50,10 @@ ); } + // <-- Functions + + boolean test_mode = false; + if (size (WFM::Args()) > 0 && is (WFM::Args(0), string)) { y2milestone ("Args: %1", WFM::Args()); if (WFM::Args(0) == "test") @@ -57,21 +62,46 @@ if (test_mode) Wizard::CreateDialog(); -// Help text for last dialog of base installation -string help_text = _("<p> -Please wait while the base system is being installed. -</p>"); - - Wizard::SetContents ( - _("Finishing Basic Installation"), - `Label (_("Preparing installation finish-scripts...")), - help_text, - false, - false - ); + Wizard::DisableBackButton (); + Wizard::DisableNextButton (); + + // Adjust a SlideShow dialog if not configured + map <string, map <string,any> > get_setup = SlideShow::GetSetup(); + if (get_setup == nil || get_setup == $[]) { + y2milestone ("No SlideShow setup has been set, adjusting"); + SlideShow::Setup([$[ + "name" : "finish", + "description" : _("Finishing Basic Installation"), + // fixed value + "value" : 100, + "units" : `sec, + ]]); + } + get_setup = nil; + + Wizard::SetTitleIcon ("yast-sysconfig"); + + // Do not open a new SlideShow widget, reuse the old one instead + // variable used later to close that dialog (if needed) + boolean required_to_open_sl_dialog = (! SlideShow::HaveSlideWidget()); + + if (required_to_open_sl_dialog) { + y2milestone ("SlideShow dialog not yet created"); + SlideShow::OpenDialog(); + } + + SlideShow::MoveToStage("finish"); + + string log = _("Creating list of finish scripts to call..."); + SlideShow::StageProgress (0, log); + SlideShow::AppendMessageToInstLog (log); // Used later in 'stages' definition - Pkg::TargetInit (Installation::destdir, true); + // Using empty callbacks that don't break the UI + PackageCallbacks::RegisterEmptyProgressCallbacks(); + Pkg::TargetInitialize (Installation::destdir); + Pkg::TargetLoad(); + PackageCallbacks::RestorePreviousProgressCallbacks(); list<map<string,any> > stages = [ $[ @@ -241,6 +271,7 @@ map info = (map) WFM::CallFunction (s, ["Info"]); if (test_mode == true) { + if (info == nil) info = $[]; y2milestone ("Test mode, forcing run"); info["when"] = [`installation, `update, `autoinst]; } @@ -282,35 +313,9 @@ return s["label"]:""; }); -Wizard::DisableBackButton (); -Wizard::DisableNextButton (); - -boolean aborted = false; - -map <string, map <string,any> > get_setup = SlideShow::GetSetup(); -if (get_setup == nil || get_setup == $[]) { - y2milestone ("No SlideShow setup has been set, adjusting"); - SlideShow::Setup([$[ - "name" : "finish", - "description" : _("Finishing Basic Installation"), - // fixed value - "value" : 100, - "units" : `sec, - ]]); -} -get_setup = nil; - -Wizard::SetTitleIcon ("yast-sysconfig"); -// Do not open a new SlideShow widget, reuse the old one instead -boolean required_to_open_sl_dialog = (! SlideShow::HaveSlideWidget()); -if (required_to_open_sl_dialog) { - y2milestone ("SlideShow dialog not yet created"); - SlideShow::OpenDialog(); -} - -SlideShow::MoveToStage("finish"); +boolean aborted = false; integer stages_nr = size (stages); integer current_stage = -1; Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Wed Jan 28 15:20:01 2009 @@ -35,7 +35,7 @@ "/var/log/YaST2/y2log" )) : - `MinHeight (8, `RichText (`opt(`plainText), details)) + `MinSize (80, 10, `RichText (`opt(`plainText, `hstretch), details)) ), //`VSpacing (1), `Left (`Label (sformat ( -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55118 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h Disk.cc DmCo.cc DmPartCo.cc DmraidCo.cc LvmVg.cc MdCo.cc Storage.cc Storage.h Volume.cc
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 15:19:27 2009 New Revision: 55118 URL: http://svn.opensuse.org/viewcvs/yast?rev=55118&view=rev Log: - waitForDevice as a static function of Storage is even nicer Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/Disk.cc trunk/storage/libstorage/src/DmCo.cc trunk/storage/libstorage/src/DmPartCo.cc trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h trunk/storage/libstorage/src/Volume.cc Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Wed Jan 28 15:19:27 2009 @@ -22,7 +22,6 @@ #include "y2storage/StorageTmpl.h" #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" -#include "y2storage/StorageDefines.h" using namespace std; @@ -502,23 +501,6 @@ } -void -udevSettle() -{ - if (access(UDEVADM, X_OK) == 0) - { - string cmd(UDEVADM " settle --timeout=20"); - y2mil("calling prog:" << cmd); - SystemCmd c(cmd); - y2mil("returned prog:" << cmd << " retcode:" << c.retcode()); - } - else - { - y2error(UDEVADM " not available"); - } -} - - unsigned getMajorDevices( const string& driver ) { unsigned ret=0; Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Wed Jan 28 15:19:27 2009 @@ -40,8 +40,6 @@ void getUdevMap(const char* path, std::map<string, std::list<string>>& m); void getRevUdevMap(const char* path, std::map<string, string>& m); -void udevSettle(); - string normalizeDevice( const string& dev ); void normalizeDevice( string& dev ); string undevDevice( const string& dev ); Modified: trunk/storage/libstorage/src/Disk.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Disk.cc?r… ============================================================================== --- trunk/storage/libstorage/src/Disk.cc (original) +++ trunk/storage/libstorage/src/Disk.cc Wed Jan 28 15:19:27 2009 @@ -1891,7 +1891,7 @@ if( ret==0 ) { if( !dmp_slave ) - getStorage()->waitForDevice(); + Storage::waitForDevice(); redetectGeometry(); } gpt_enlarge = false; @@ -2278,7 +2278,7 @@ if( p->type()!=EXTENDED ) getStorage()->waitForDevice( p->device() ); else - getStorage()->waitForDevice(); + Storage::waitForDevice(); if( p->type()==LOGICAL && getStorage()->instsys() ) { // kludge to make the extended partition visible in @@ -2376,7 +2376,7 @@ redetectGeometry(); } if( ret==0 && !dmp_slave ) - getStorage()->waitForDevice(); + Storage::waitForDevice(); } else { Modified: trunk/storage/libstorage/src/DmCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/DmCo.cc (original) +++ trunk/storage/libstorage/src/DmCo.cc Wed Jan 28 15:19:27 2009 @@ -334,7 +334,7 @@ if( c.retcode()!=0 ) ret = DM_REMOVE_FAILED; else - getStorage()->waitForDevice(); + Storage::waitForDevice(); y2mil( "this:" << *this ); getStorage()->logProcData( cmd ); } Modified: trunk/storage/libstorage/src/DmPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmPartCo.… ============================================================================== --- trunk/storage/libstorage/src/DmPartCo.cc (original) +++ trunk/storage/libstorage/src/DmPartCo.cc Wed Jan 28 15:19:27 2009 @@ -572,7 +572,7 @@ del_ptable = false; removeFromMemory(); handleWholeDevice(); - getStorage()->waitForDevice(); + Storage::waitForDevice(); } y2mil("ret:" << ret); return( ret ); @@ -826,7 +826,7 @@ updateMinor(); } if( ret==0 ) - getStorage()->waitForDevice(); + Storage::waitForDevice(); y2mil("ret:" << ret); return( ret ); } @@ -1072,7 +1072,7 @@ disk = NULL; if( rhs.disk ) disk = new Disk( *rhs.disk ); - getStorage()->waitForDevice(); + Storage::waitForDevice(); ConstDmPartPair p = rhs.dmpartPair(); for( ConstDmPartIter i = p.begin(); i!=p.end(); ++i ) { Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Wed Jan 28 15:19:27 2009 @@ -124,7 +124,7 @@ } active = val; } - udevSettle(); + Storage::waitForDevice(); } void DmraidCo::getRaids( list<string>& l ) Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Jan 28 15:19:27 2009 @@ -1108,7 +1108,7 @@ active = val; } - udevSettle(); + Storage::waitForDevice(); } Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Jan 28 15:19:27 2009 @@ -585,7 +585,7 @@ } active = val; } - udevSettle(); + Storage::waitForDevice(); } int Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Jan 28 15:19:27 2009 @@ -5794,34 +5794,39 @@ } -void Storage::waitForDevice() const -{ - udevSettle(); +void +Storage::waitForDevice() +{ + string cmd(UDEVADM " settle --timeout=20"); + y2mil("calling prog:" << cmd); + SystemCmd c(cmd); + y2mil("returned prog:" << cmd << " retcode:" << c.retcode()); } -int Storage::waitForDevice( const string& device ) const - { +int +Storage::waitForDevice(const string& device) const +{ int ret = 0; - udevSettle(); - bool exist = access( device.c_str(), R_OK )==0; - y2milestone( "device:%s exist:%d", device.c_str(), exist ); - if( !exist ) + waitForDevice(); + bool exist = access(device.c_str(), R_OK)==0; + y2mil("device:" << device << " exist:" << exist); + if (!exist) + { + for (int count = 0; count < 500; count++) { - unsigned count=0; - while( !exist && count<500 ) - { - usleep( 10000 ); - exist = access( device.c_str(), R_OK )==0; - count++; - } - y2milestone( "device:%s exist:%d", device.c_str(), exist ); + usleep(10000); + exist = access(device.c_str(), R_OK) == 0; + if (exist) + break; } - if( !exist ) + y2mil("device:" << device << " exist:" << exist); + } + if (!exist) ret = STORAGE_DEVICE_NODE_NOT_FOUND; y2mil("ret:" << ret); - return( ret ); - } + return ret; +} void Storage::checkDeviceExclusive( const string& device, unsigned secs ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Wed Jan 28 15:19:27 2009 @@ -450,8 +450,8 @@ const string& getExtendedErrorMessage() const { return extendedError; } void eraseFreeInfo( const string& device ); - void waitForDevice() const; - int waitForDevice( const string& device ) const; + static void waitForDevice(); + int waitForDevice(const string& device) const; void checkDeviceExclusive( const string& device, unsigned secs ); int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, unsigned long long beginK = 200, unsigned long long endK = 10); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Wed Jan 28 15:19:27 2009 @@ -904,7 +904,7 @@ y2mil( "writing \"add\" to " << path ); file << "add" << endl; file.close(); - cont->getStorage()->waitForDevice(); + Storage::waitForDevice(); } else y2mil( "error opening " << path << " err:" << -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55117 - in /trunk/storage/libstorage/src: AppUtil.cc AppUtil.h DmraidCo.cc LvmVg.cc MdCo.cc Storage.cc Storage.h
by aschnell＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: aschnell Date: Wed Jan 28 14:43:17 2009 New Revision: 55117 URL: http://svn.opensuse.org/viewcvs/yast?rev=55117&view=rev Log: - added udevSettle to AppUtil so it can be called without access to storage object Modified: trunk/storage/libstorage/src/AppUtil.cc trunk/storage/libstorage/src/AppUtil.h trunk/storage/libstorage/src/DmraidCo.cc trunk/storage/libstorage/src/LvmVg.cc trunk/storage/libstorage/src/MdCo.cc trunk/storage/libstorage/src/Storage.cc trunk/storage/libstorage/src/Storage.h Modified: trunk/storage/libstorage/src/AppUtil.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.c… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.cc (original) +++ trunk/storage/libstorage/src/AppUtil.cc Wed Jan 28 14:43:17 2009 @@ -22,6 +22,7 @@ #include "y2storage/StorageTmpl.h" #include "y2storage/AppUtil.h" #include "y2storage/SystemCmd.h" +#include "y2storage/StorageDefines.h" using namespace std; @@ -501,6 +502,23 @@ } +void +udevSettle() +{ + if (access(UDEVADM, X_OK) == 0) + { + string cmd(UDEVADM " settle --timeout=20"); + y2mil("calling prog:" << cmd); + SystemCmd c(cmd); + y2mil("returned prog:" << cmd << " retcode:" << c.retcode()); + } + else + { + y2error(UDEVADM " not available"); + } +} + + unsigned getMajorDevices( const string& driver ) { unsigned ret=0; Modified: trunk/storage/libstorage/src/AppUtil.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/AppUtil.h… ============================================================================== --- trunk/storage/libstorage/src/AppUtil.h (original) +++ trunk/storage/libstorage/src/AppUtil.h Wed Jan 28 14:43:17 2009 @@ -40,6 +40,8 @@ void getUdevMap(const char* path, std::map<string, std::list<string>>& m); void getRevUdevMap(const char* path, std::map<string, string>& m); +void udevSettle(); + string normalizeDevice( const string& dev ); void normalizeDevice( string& dev ); string undevDevice( const string& dev ); Modified: trunk/storage/libstorage/src/DmraidCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/DmraidCo.… ============================================================================== --- trunk/storage/libstorage/src/DmraidCo.cc (original) +++ trunk/storage/libstorage/src/DmraidCo.cc Wed Jan 28 14:43:17 2009 @@ -124,6 +124,7 @@ } active = val; } + udevSettle(); } void DmraidCo::getRaids( list<string>& l ) Modified: trunk/storage/libstorage/src/LvmVg.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/LvmVg.cc?… ============================================================================== --- trunk/storage/libstorage/src/LvmVg.cc (original) +++ trunk/storage/libstorage/src/LvmVg.cc Wed Jan 28 14:43:17 2009 @@ -1107,6 +1107,8 @@ } active = val; } + + udevSettle(); } Modified: trunk/storage/libstorage/src/MdCo.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/MdCo.cc?r… ============================================================================== --- trunk/storage/libstorage/src/MdCo.cc (original) +++ trunk/storage/libstorage/src/MdCo.cc Wed Jan 28 14:43:17 2009 @@ -585,6 +585,7 @@ } active = val; } + udevSettle(); } int Modified: trunk/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.c… ============================================================================== --- trunk/storage/libstorage/src/Storage.cc (original) +++ trunk/storage/libstorage/src/Storage.cc Wed Jan 28 14:43:17 2009 @@ -207,11 +207,8 @@ if( instsys() ) { DmraidCo::activate( true ); - waitForDevice(); MdCo::activate( true, tmpDir() ); - waitForDevice(); LvmVg::activate( true ); - waitForDevice(); delete ppart; ppart = new ProcPart; } @@ -5797,25 +5794,16 @@ } -int Storage::waitForDevice() const +void Storage::waitForDevice() const { - int ret = 0; - if (access(UDEVADM, X_OK) == 0) - { - string cmd(UDEVADM " settle --timeout=20"); - y2mil("calling prog:" << cmd); - SystemCmd c(cmd); - y2mil("returned prog:" << cmd << " retcode:" << c.retcode()); - } - y2mil("ret:" << ret); - return ret; + udevSettle(); } int Storage::waitForDevice( const string& device ) const { int ret = 0; - waitForDevice(); + udevSettle(); bool exist = access( device.c_str(), R_OK )==0; y2milestone( "device:%s exist:%d", device.c_str(), exist ); if( !exist ) Modified: trunk/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Storage.h… ============================================================================== --- trunk/storage/libstorage/src/Storage.h (original) +++ trunk/storage/libstorage/src/Storage.h Wed Jan 28 14:43:17 2009 @@ -450,7 +450,7 @@ const string& getExtendedErrorMessage() const { return extendedError; } void eraseFreeInfo( const string& device ); - int waitForDevice() const; + void waitForDevice() const; int waitForDevice( const string& device ) const; void checkDeviceExclusive( const string& device, unsigned secs ); int zeroDevice(const string& device, unsigned long long sizeK, bool random = false, -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r55116 - /trunk/installation/src/clients/inst_finish.ycp
by locilka＠svn.opensuse.org 28 Jan '09

28 Jan '09

Author: locilka Date: Wed Jan 28 14:41:16 2009 New Revision: 55116 URL: http://svn.opensuse.org/viewcvs/yast?rev=55116&view=rev Log: ouch, .local -> WFM Modified: trunk/installation/src/clients/inst_finish.ycp Modified: trunk/installation/src/clients/inst_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_fi… ============================================================================== --- trunk/installation/src/clients/inst_finish.ycp (original) +++ trunk/installation/src/clients/inst_finish.ycp Wed Jan 28 14:41:16 2009 @@ -40,7 +40,7 @@ void ReportClientError (string client_error_text) { // get the latest errors - map cmd = (map) SCR::Execute (.local.bash_output, "tail -n 200 /var/log/YaST2/y2log | grep ' <$3\|5$> '"); + map cmd = (map) WFM::Execute (.local.bash_output, "tail -n 200 /var/log/YaST2/y2log | grep ' <$3\|5$> '"); InstError::ShowErrorPopUp ( _("Installation Error"), -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0