October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52715 - in /trunk/storage/storage/src: include/lvm_lib.ycp include/lvm_lv_lib.ycp include/lvm_pv_lib.ycp include/lvm_ui_dialogs.ycp include/partition_defines.ycp inst_custom_part.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:54:56 2008 New Revision: 52715 URL: http://svn.opensuse.org/viewcvs/yast?rev=52715&view=rev Log: - disabled many unused functions Modified: trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/include/lvm_lv_lib.ycp trunk/storage/storage/src/include/lvm_pv_lib.ycp trunk/storage/storage/src/include/lvm_ui_dialogs.ycp trunk/storage/storage/src/include/partition_defines.ycp trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Wed Oct 29 23:54:56 2008 @@ -61,6 +61,7 @@ // return "0" if input is invalid // // pesize is valid 8kB to 512MB in power of 2 +// used by autoyast define integer pesize_str_to_byte(string input) { integer ret = kmgt_str_to_byte(input); @@ -76,7 +77,7 @@ ////////////////////////////////////////////////////////////////////// // Let the User create a new Volume group: open dialog ... // return: the changed targetMap and lvm_vgs and cancelled - +// used by autoyast define map addVolumeGroup( map vg, map<string,map> targetMap, list lvm_vgs ) ``{ boolean cancelled = true; @@ -117,4 +118,5 @@ ``{ return( Storage::DeleteLvmVg( current_vg )); }; + } Modified: trunk/storage/storage/src/include/lvm_lv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lv_lib.ycp Wed Oct 29 23:54:56 2008 @@ -64,6 +64,7 @@ return( ret ); }; +/* define boolean editLogicalVolume( map Lv, string current_vg) ``{ y2milestone( "editLogicalVolume Lv:%1", Lv ); @@ -84,6 +85,8 @@ } return( ret ); }; +*/ + define boolean removeLogicalVolume( string disk, string device ) ``{ @@ -107,7 +110,8 @@ // ... // // out: [ 10344343, 2223333 ] [ used, avail ] - + +/* define list get_lv_size_info( map<string,map> targetMap, string current_vg ) ``{ list ret = []; @@ -119,7 +123,7 @@ y2milestone( "get_lv_size_info vg=%1 ret=%2", current_vg, ret ); return( ret ); }; - +*/ //////////////////////////////////////////////////////////////////////////////// // Get all existing lv names of a volume group @@ -151,6 +155,7 @@ // `item(`id(2//dev/hda), "/dev/hda2 ", " /usr ", "system", " 2G ", " Linux ") // ]; +/* define list get_lv_widget_table( list<map> possPvList ) ``{ list ret = []; @@ -181,7 +186,7 @@ } )); }; - +*/ } Modified: trunk/storage/storage/src/include/lvm_pv_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_pv_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_pv_lib.ycp Wed Oct 29 23:54:56 2008 @@ -37,6 +37,7 @@ // ////////////////////////////////////////////////////////////////////// +// used by autoyast define boolean addPhysicalVolume( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -53,8 +54,9 @@ boolean ret = Storage::ExtendLvmVg( current_vg, id ); return( ret ); }; - + +/* define boolean removePhysicalVolume( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -77,12 +79,13 @@ } return( ret ); }; - +*/ ////////////////////////////////////////////////////////////////////// // belongs the the partition "id" already to a volume group ////////////////////////////////////////////////////////////////////// +/* define boolean isItemPv( map<string,map> tg, string id ) ``{ map part = $[]; @@ -93,13 +96,13 @@ return( part["used_by_type"]:`UB_NONE == `UB_LVM || part["used_by_type"]:`UB_NONE == `UB_EVMS ); }; - +*/ ////////////////////////////////////////////////////////////////////// // belongs the the partition "id" already to a volume group // if YES: popup a proper Message and return(false) ////////////////////////////////////////////////////////////////////// - +/* define boolean CheckItemIsNotPv( map<string,map> tg, string id ) ``{ if( !isItemPv(tg,id) ) @@ -156,7 +159,7 @@ } return( false ); }; - +*/ ///////////////////////////////////////////////////////////////// // Get all partitions, we can probably use as physical volumes @@ -239,6 +242,7 @@ * -> Existing LVM partition with volume group * -> size of volume group to small for all logical partition */ +/* define boolean check_pv_delete( map<string,map> targetMap, string id, string current_vg ) ``{ @@ -260,7 +264,7 @@ y2milestone( "check_pv_delete ret:%1", ret ); return( ret ); } - +*/ boolean check_vgname_dev( string vgname ) { @@ -282,4 +286,3 @@ return( ret ); } } - Modified: trunk/storage/storage/src/include/lvm_ui_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_ui_dialogs.ycp (original) +++ trunk/storage/storage/src/include/lvm_ui_dialogs.ycp Wed Oct 29 23:54:56 2008 @@ -32,15 +32,17 @@ include "partitioning/custom_part_dialogs.ycp"; include "partitioning/custom_part_lib.ycp"; include "partitioning/lvm_lv_lib.ycp"; -include "partitioning/lvm_ui_lib.ycp"; +/* define void handle_max( integer stripe, string max_text ) ``{ y2milestone( "stripe %1", stripe ); UI::ChangeWidget(`id("max_size"), `Enabled, stripe==1 ); UI::ChangeWidget(`id("max_text"), `Value, stripe==1?max_text:"" ); } - +*/ + +/* define map DlgCreateEditLogicaVolume( symbol create_or_edit, map<string,any> Lv, integer max_size, string vgname, list lvs, map<symbol,map> file_systems, @@ -381,13 +383,13 @@ return( nil ); } }; - +*/ ////////////////////////////////////////////////////////////////////////////// // Dialog "Create a Volume Group ////////////////////////////////////////////////////////////////////////////// - +/* define boolean HandleEditLv( map<string,map> targetMap, string device ) ``{ boolean ret = false; @@ -420,6 +422,7 @@ y2milestone( "ret %1", ret ); return( ret ); } +*/ define boolean HandleRemoveLv( map<string,map> targetMap, string id ) ``{ @@ -470,6 +473,7 @@ return( ret ); } +/* define map DlgCreateVolumeGroup( list vgm_list ) ``{ string vgname = ""; @@ -574,5 +578,6 @@ return( $[] ); } }; +*/ } Modified: trunk/storage/storage/src/include/partition_defines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/part… ============================================================================== --- trunk/storage/storage/src/include/partition_defines.ycp (original) +++ trunk/storage/storage/src/include/partition_defines.ycp Wed Oct 29 23:54:56 2008 @@ -177,6 +177,7 @@ *---------------------------------------------------------------------- * TODO: remove */ +/* string ByteToHumanStringWithZero(integer number) { if (number == 0) @@ -189,7 +190,7 @@ return ByteToHumanString(number); } }; - +*/ //////////////////////////////////////////////////////////////////////// // input: Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 23:54:56 2008 @@ -1862,7 +1862,7 @@ } else if( part["type"]:`unknown == `lvm ) { - HandleEditLv( tg, id ); + // HandleEditLv( tg, id ); } else { -- 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] r52714 - /trunk/storage/storage/src/include/ep-main.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:39:47 2008 New Revision: 52714 URL: http://svn.opensuse.org/viewcvs/yast?rev=52714&view=rev Log: - stricter type Modified: trunk/storage/storage/src/include/ep-main.ycp Modified: trunk/storage/storage/src/include/ep-main.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-m… ============================================================================== --- trunk/storage/storage/src/include/ep-main.ycp (original) +++ trunk/storage/storage/src/include/ep-main.ycp Wed Oct 29 23:39:47 2008 @@ -241,7 +241,7 @@ } - any ExpertPartitioner() + symbol ExpertPartitioner() { SCR::Write(.target.ycp, Storage::SaveDumpPath("targetmap-ep-start"), Storage::GetTargetMap()); -- 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] r52713 - /trunk/storage/storage/src/include/custom_part_lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 23:16:26 2008 New Revision: 52713 URL: http://svn.opensuse.org/viewcvs/yast?rev=52713&view=rev Log: - use Storage::ByteToHumanString Modified: trunk/storage/storage/src/include/custom_part_lib.ycp Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Wed Oct 29 23:16:26 2008 @@ -502,7 +502,7 @@ // %2 is prelaced by a size (e.g. 10 MB) Popup::Warning(sformat(_("Your partition is too small to use %1. The minimum size for this file system is %2. -"), FileSystems::GetName(fs,""), ByteToHumanStringWithZero(min_size) )); +"), FileSystems::GetName(fs,""), Storage::ByteToHumanString(min_size) )); ret = false; } } @@ -1171,7 +1171,7 @@ // error popup text Popup::Error(sformat(_("The size entered is invalid. Enter a size from 1M to %1. For example, 40M or 1G."), - ByteToHumanStringWithZero(max_size)) ); + Storage::ByteToHumanString(max_size)) ); else // error popup text Popup::Error(_("The size entered is invalid. @@ -1185,7 +1185,7 @@ // error popup text Popup::Error(sformat(_("The size entered is too large. Enter a size from 1M to %1."), - ByteToHumanStringWithZero(max_size)) ); + Storage::ByteToHumanString(max_size)) ); return( 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] r52712 - in /trunk/storage/storage/src: inst_custom_part.ycp modules/Storage.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 20:37:49 2008 New Revision: 52712 URL: http://svn.opensuse.org/viewcvs/yast?rev=52712&view=rev Log: - removed two obsolete functions Modified: trunk/storage/storage/src/inst_custom_part.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 20:37:49 2008 @@ -35,7 +35,6 @@ include "partitioning/partition_defines.ycp"; - include "partitioning/nfs.ycp"; include "partitioning/lvm_ui_dialogs.ycp"; include "partitioning/lvm_pv_lib.ycp"; include "partitioning/raid_lib.ycp"; Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Wed Oct 29 20:37:49 2008 @@ -4156,23 +4156,6 @@ } -// TODO: remove -/* Contain the current key ( subdevkey ) for all wizards */ -string WizardKey = ""; - -global define string GetWizardKey() - ``{ - y2debug( " Return wizard key %1", WizardKey); - return WizardKey; - }; - -global define void SetWizardKey( string key ) - ``{ - y2debug(" Set WizardKey %1", WizardKey); - WizardKey = key; - }; - - /** * Check if a disk is a real disk and not RAID or LVM * -- 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] r52711 - /trunk/storage/storage/src/inst_custom_part.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 20:31:16 2008 New Revision: 52711 URL: http://svn.opensuse.org/viewcvs/yast?rev=52711&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/inst_custom_part.ycp Modified: trunk/storage/storage/src/inst_custom_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_custom_… ============================================================================== --- trunk/storage/storage/src/inst_custom_part.ycp (original) +++ trunk/storage/storage/src/inst_custom_part.ycp Wed Oct 29 20:31:16 2008 @@ -45,14 +45,9 @@ - boolean edit_cylinder = true; boolean bsd_label = false; - string focusline = ""; - - - /*--------------------------------------------------------------------- * Check if the numer is in the format <number> * @@ -1817,44 +1812,7 @@ symbol ret = nil; - y2milestone( "Custom partitioner started" ); - Storage::SetWizardKey(""); - - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_s"), - Storage::GetTargetMap() ); - - map<string,map> tg = Storage::GetTargetMap(); - - if( !Storage::CheckBackupState("custom_part") ) - { - Storage::CreateTargetBackup("custom_part"); - } - - - - // Main dialog: Header - - string back_label = ""; - string next_label = ""; - if( Stage::initial () ) - { - back_label = Label::BackButton(); - next_label = Label::NextButton(); - } - else - { - back_label = Label::CancelButton(); - next_label = Label::OKButton(); - Wizard::HideAbortButton(); - } - - ////////////////////////////////////////////////////////////////// - //// Loop for User Input .... - ////////////////////////////////////////////////////////////////// - - repeat - { map<string,map> tg = Storage::GetTargetMap(); ret = (symbol)Wizard::UserInput(); @@ -1866,7 +1824,6 @@ if (ret == `resize) { string id = (string)UI::QueryWidget(`id(`table), `CurrentItem); - focusline = id; map part = $[]; map disk = Storage::GetDisk( tg, id ); if( !haskey( tg, id ) ) @@ -1876,7 +1833,6 @@ { Popup::Error( Partitions::RdonlyText( disk["device"]:"", true )); ret = `again; - continue; } y2milestone( "disk=%1", disk ); @@ -1964,108 +1920,4 @@ } } - ///////////////////////////////////////////////////////////// - // End of Actions, Now check the returncode - ///////////////////////////////////////////////////////////// - - if (ret == `next || ret == `back || ret == `raid || ret == `lvm || - ret == `raid_settings || ret == `raid_wizard || ret == `evms ) - { - symbol doagain = `next; - - if( ret == `raid_wizard || ret == `raid_settings ) - { - if( Storage::CheckBackupState("raid")) - Storage::DisposeTargetBackup("raid"); - } - - if( ret == `back && - !Storage::EqualBackupStates( "custom_part", "", true )) - { - // popup text %1 will be replaces with button text - string txt = sformat( _("You have changed the partitioning. -These changes are lost if you exit the main dialog with %1. -Really quit the main dialog? -"), - deletechars(back_label,"&") ); - if( !Popup::YesNo( txt )) - { - doagain = `again; - } - } - if( ret == `next ) - { - boolean changed = - !Storage::EqualBackupStates( "custom_part", "", true ); - y2milestone( "CheckNext ret=%1 changed=%2", ret, changed ); - if( changed ) - { - Storage::SetPartMode( "CUSTOM" ); - Storage::UpdateChangeTime(); - } - } - if ( ret == `next ) - { - list retval = check_created_partition_table( Storage::GetTargetMap(), true, - Stage::initial()&&!Mode::repair() ); - Storage::SetTargetMap( retval[0]:$[] ); - doagain = retval[1]:`next; - } - - if( (ret==`abort || ret==`back || ret==`next) && doagain!=`again ) - { - Storage::DisposeTargetBackup("custom_part"); - } - - if( doagain == `again ) ret = `again; - - if( ret != `back ) - { - if (ret == `apply) return `again; - } - if( (ret == `back||ret==`abort) && Storage::GetPartMode()=="NORMAL" ) - { - Storage::SetPartMode( "CUSTOM" ); - } - } - - y2milestone( "end main loop ret %1 focusline %2", ret, focusline ); - } until (ret == `next || ret == `back || ret == `cancel || - ret == `raid_wizard || ret == `raid_settings || - ret == `evms || - ret == `lvm || ret == `lvmlv || ret == `abort ); - - Wizard::RestoreNextButton(); - if( (ret == `lvm || ret == `raid_wizard || ret == `raid_settings || - ret == `evms) && - !Stage::initial () ) - { - Wizard::RestoreBackButton(); - } - - - - SCR::Write(.target.ycp, Storage::SaveDumpPath("targetMap_e"), - Storage::GetTargetMap() ); - - //next by installation - if( Stage::initial () && ret == `next ) - ret = `instnext; - - //next in existing system - if( !Stage::initial () && ret == `next ) - ret = `sysnext; - - if( ret == `back ) - ret = `backtoi; - - /* - if( ret == `raid_settings || ret == `raid_wizard ) - Storage::Record(); - */ - - y2milestone( "ChangeTime %1", Storage::GetTargetChangeTime() ); - - return ret; - } -- 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] r52710 - /tags/stable-2_17_10/registration/
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 19:43:15 2008 New Revision: 52710 URL: http://svn.opensuse.org/viewcvs/yast?rev=52710&view=rev Log: Created tag stable-2_17_10 for registration Added: tags/stable-2_17_10/registration/ - copied from r52709, trunk/registration/ -- 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] r52709 - in /trunk/registration: VERSION package/yast2-registration.changes src/clients/inst_suse_register.ycp src/config/Makefile.am yast2-registration.spec.in
by jdsn＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: jdsn Date: Wed Oct 29 19:43:03 2008 New Revision: 52709 URL: http://svn.opensuse.org/viewcvs/yast?rev=52709&view=rev Log: remove requires to sles-release fix makefile 2.17.10 Modified: trunk/registration/VERSION trunk/registration/package/yast2-registration.changes trunk/registration/src/clients/inst_suse_register.ycp trunk/registration/src/config/Makefile.am trunk/registration/yast2-registration.spec.in Modified: trunk/registration/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/VERSION?rev=52709&r… ============================================================================== --- trunk/registration/VERSION (original) +++ trunk/registration/VERSION Wed Oct 29 19:43:03 2008 @@ -1 +1 @@ -2.17.9 +2.17.10 Modified: trunk/registration/package/yast2-registration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/package/yast2-regis… ============================================================================== --- trunk/registration/package/yast2-registration.changes (original) +++ trunk/registration/package/yast2-registration.changes Wed Oct 29 19:43:03 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Oct 29 16:32:31 CET 2008 - jdsn(a)suse.de + +- remove requires to sles-release +- 2.17.10 + +------------------------------------------------------------------- Wed Oct 29 15:31:04 CET 2008 - jdsn(a)suse.de - consistent naming in autoYaST profile Modified: trunk/registration/src/clients/inst_suse_register.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/clients/inst_su… ============================================================================== --- trunk/registration/src/clients/inst_suse_register.ycp (original) +++ trunk/registration/src/clients/inst_suse_register.ycp Wed Oct 29 19:43:03 2008 @@ -577,6 +577,7 @@ boolean launchBrowser(string url) { + boolean retval=false; y2milestone("Just about to start a browser for manual interaction in registration."); // check for valid url map parsed = URL::Parse(url); @@ -600,16 +601,18 @@ if (textmode) { y2milestone("Launching textmode browser with: %1", command); - UI::RunInTerminal(command); + retval = ( (integer)UI::RunInTerminal(command) == 0 ) ? true:false; } else { y2milestone("Launching graphical borwser with: %1", command); - SCR::Execute(.target.bash, command ); + retval = ( (integer)SCR::Execute(.target.bash, command ) == 0 ) ? true:false; } + y2milestone("The registration browser returned with error code: %1", retval); + UI::RedrawScreen(); - return true; + return retval; } @@ -897,7 +900,7 @@ else if ( SRstatus == 1 ) { // still needinfo, change displayed information and stay in manual interaction - manual_interaction_overview = Register::suseRegisterListParams(); + manual_interaction_overview = YSR::get_registerReadableText(); // (bnc#435869) UI::ChangeWidget( `id(`needinfo), `Value, manual_interaction_overview ); } else Modified: trunk/registration/src/config/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/src/config/Makefile… ============================================================================== --- trunk/registration/src/config/Makefile.am (original) +++ trunk/registration/src/config/Makefile.am Wed Oct 29 19:43:03 2008 @@ -3,7 +3,7 @@ desktop_DATA = suse_register.desktop customer_center.desktop online_update_configuration.desktop rncdir = $(schemadir)/autoyast/rnc -rnc_DATA = registration.rnc automatic_online_update.rnc +rnc_DATA = registration.rnc online_update_configuration.rnc fillup_DATA = sysconfig.suse_register-yast2-registration sysconfig.automatic_online_update-yast2-registration Modified: trunk/registration/yast2-registration.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/registration/yast2-registration.… ============================================================================== --- trunk/registration/yast2-registration.spec.in (original) +++ trunk/registration/yast2-registration.spec.in Wed Oct 29 19:43:03 2008 @@ -14,7 +14,7 @@ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-testsuite yast2-packager BuildRequires: perl-TimeDate limal limal-perl limal-ca-mgm-perl BuildRequires: yast2-pkg-bindings >= 2.17.20 -BuildRequires: suseRegister sles-release +BuildRequires: suseRegister BuildArchitectures: noarch @@ -57,8 +57,7 @@ %dir @yncludedir@/registration @yncludedir@/registration/*.ycp @desktopdir@/*.desktop -@schemadir@/autoyast/rnc/registration.rnc -@schemadir@/autoyast/rnc/automatic_online_update.rnc +@schemadir@/autoyast/rnc/*.rnc /usr/lib/YaST2/bin/online_update /usr/share/YaST2/yastbrowser -- 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] r52708 - /trunk/storage/storage/src/include/raid_lib.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 18:46:55 2008 New Revision: 52708 URL: http://svn.opensuse.org/viewcvs/yast?rev=52708&view=rev Log: - removed obsolete functions Modified: trunk/storage/storage/src/include/raid_lib.ycp Modified: trunk/storage/storage/src/include/raid_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/raid… ============================================================================== --- trunk/storage/storage/src/include/raid_lib.ycp (original) +++ trunk/storage/storage/src/include/raid_lib.ycp Wed Oct 29 18:46:55 2008 @@ -11,71 +11,12 @@ * mike <mike(a)suse.de> * * $Id$ - * - * - *---------------------- - * rd or Rd == raid device, a device like hda1 or /dev/system/usr - * that belongs to a raid */ - - { import "Storage"; - import "Mode"; import "Partitions"; - import "Wizard"; - textdomain "storage"; - - -/** - * Build raid dev item list e.g.: [`item (`id ("/dev/md2"), "/dev/md2", false)] - * - **/ -define list<term> get_raid_devices( map tg, integer raid_nr ) - ``{ - list<term> all_raid_devices = []; - list<map> partitions = tg["/dev/md","partitions"]:[]; - - foreach( map part, partitions, - ``{ - integer num = part["nr"]:255; - all_raid_devices = - add( all_raid_devices, - `item( `id(sformat("/dev/md%1", num )), - Storage::GetDeviceName( "/dev/md", num ), - num == raid_nr )); - }); - return all_raid_devices; - }; - - /** - * Checks if a RAID is currently created or if it was already - * - **/ -define boolean IsRaidCreated( map tg, string device, symbol what ) - ``{ - boolean created = false; - if( what != `wizard ) - { - list<map> partitions = (list<map>)tg["/dev/md", "partitions"]:[]; - y2milestone( "parts %1", partitions ); - - foreach( map part, partitions, - ``{ - if( part["device"]:""==device && part["create"]:false ) - { - created = true; - } - }); - } - else - { - created = true; - } - y2milestone( "device %1 what %2 created %3", device, what, created ); - return( created ); - }; + textdomain "storage"; /* @@ -127,106 +68,4 @@ }); return( allret ); }; - - -/* - * get the number of devices which belong to the raid - */ -define integer getNrOfParts( map<string,map> targetMap, string current_raid ) - ``{ - list<map> partition_list = get_possible_rds( targetMap ); - string dev = "md" + current_raid; - - partition_list = filter( map part, partition_list, - ``( part["used_by"]:""==dev ) ); - return( size( partition_list ) ); - }; - - -/** - * belongs the the partition "id" already to a raid - **/ -define boolean isItemRd( map<string,map> tg, string id ) - ``{ - map partition = Storage::GetPartition( tg, id ); - return( partition["used_by_type"]:`UB_NONE == `UB_MD ); - }; - - -/** - * number for /dev/mdX, 0 for /dev/md0, 1 for /dev/md1 - */ -define integer get_free_raid_nr( map<string,map> targetMap, integer min ) - ``{ - integer i = min; - list raid_nrs = maplist( map mdX, targetMap["/dev/md","partitions"]:[], - ``(mdX["nr"]:256)) ; - while( contains(raid_nrs, i) && i < 255) - { - i = i+1; - } - y2milestone( "get_free_raid_nr ret:%1", i ); - return( i ); - }; - -/** - * Add the main device ( "/dev/hda") to the partition map. - * partition = $[ - * "nr" : 1, - * "main_dev": "/dev/hda", - * ...... - * ]; - * Use change !!!!!!!!! - * @param targetMap all targets - * @return nil - */ -define map add_main_dev_to_partition_map( map<string,map> targetMap ) - ``{ - foreach( string targetdevice, map target, targetMap, - ``{ - targetMap[targetdevice,"partitions"] = - maplist( map p, target["partitions"]:[], - ``({ - if( size(p["used_by"]:"")>0 ) - { - p["main_dev"] = targetdevice; - } - return( p ); - })); - }); - y2debug("targets %1", targetMap ); - return( targetMap ); - }; - -/** - * @return list a list with all partition that have a key raid_name != "". - * @param targetMap all targets - */ -define list<map> all_raid_partitions( map<string,map> targetMap ) - ``{ - list<list> ret = - (list<list>) maplist( string targetdevice, map target, targetMap, - ``( filter( map part, target["partitions"]:[], - ``(part["used_by_type"]:`UB_NONE==`UB_MD)))); - return(list<map>)( flatten(ret) ); - }; - -define boolean check_raid_possible( map<string,map> targetMap ) - ``{ - integer possible_parts_found = size(get_possible_rds(targetMap)); - - if( possible_parts_found < 2 ) - { - // Translators: the text 'do not format' must match the label in the corresponding popup! - Popup::Message(_("To use RAID, at least two partitions of type 0xFD (or 0x83) -are required. Change your partition table accordingly. -In most cases, this can be done in the following way: -click 'Create', select 'Do not format', and set the File System ID to 0xFD. -")); - - return false; - } - return true; - } - } -- 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] r52707 - /trunk/storage/storage/src/include/custom_part_dialogs.ycp
by aschnell＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: aschnell Date: Wed Oct 29 18:20:23 2008 New Revision: 52707 URL: http://svn.opensuse.org/viewcvs/yast?rev=52707&view=rev Log: - removed obsolete code Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp Modified: trunk/storage/storage/src/include/custom_part_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_dialogs.ycp (original) +++ trunk/storage/storage/src/include/custom_part_dialogs.ycp Wed Oct 29 18:20:23 2008 @@ -31,10 +31,6 @@ import "Label"; import "Popup"; - ////////////////////////////////////////////////////////////////////////////// - // Dialog Password for Crypted FS - ////////////////////////////////////////////////////////////////////////////// - include "partitioning/partition_defines.ycp"; include "partitioning/custom_part_helptexts.ycp"; @@ -1085,80 +1081,6 @@ } - -define term RaidOptionsDlg( map new_val, boolean edit_raid_type ) - ``{ - integer chunk_size = new_val["chunk_size"]:0; - string parity_algorithm = new_val["parity_algorithm"]:"left_asymmetric"; - string raid_type = new_val["raid_type"]:"raid1"; - term editRaid = `VSpacing(1); - - // 4KB .. 4096KB - list chunk_list = []; - integer i = 4; - while( i <= 4096 ) - { - integer chunk_item = i; - chunk_list = add( chunk_list, - `item(`id(chunk_item), tostring(chunk_item), - chunk_size==chunk_item )); - i = i*2; - } - - if( edit_raid_type ) - { - editRaid = `VBox( - `VSpacing(), - `Left (`ComboBox( `id(`raid_combo), - `opt(`notify, `hstretch ), - // button text - _("RAID T&ype"), - [ `item(`id("raid0"), "raid0", - "raid0"==raid_type ), - `item(`id("raid1"), "raid1", - "raid1"==raid_type ), - `item(`id("raid5"), "raid5", - "raid5"==raid_type ), - `item(`id("multipath"), "multipath", - "multipath"==raid_type ) - ])), - `VSpacing() - ); - } - - return `VSquash( - `VBox( - editRaid, - // Raid combobox description (don't translate to much ..) - `Left (`ComboBox ( `id(`chunk_size),`opt(`hstretch ), _("Chunk s&ize in KB"), chunk_list )), - `VSpacing (), - // Raid combobox description (don't translate to much ..) - `Left (`ComboBox ( `id(`parity),`opt(`hstretch ), _("Parity &algorithm (only for RAID 5)"), - [ `item(`id("left_asymmetric"), "left-asymmetric", "left_asymmetric" == parity_algorithm ), - `item(`id("left_symmetric"), "left-symmetric", "left_symmetric" == parity_algorithm ), - `item(`id("right_asymmetric"), "right-asymmetric", "right_asymmetric" == parity_algorithm ), - `item(`id("right_symmetric"), "right-symmetric", "right_symmetric" == parity_algorithm ) - ])), - `VSpacing () - )); - - } - -define term LoopOptionsDlg( string pb, string cb, string sb ) - ``{ - term widget = - `VSquash( - `VBox( - `VSpacing(), - `Left( `TextEntry( `id(`loop_path), `opt(`notify), pb )), - `VSpacing(1), - `Left( `CheckBox( `id(`loop_create), `opt(`notify), cb )), - `Left( `TextEntry( `id(`loop_size), `opt(`notify), sb )), - `VSpacing() - )); - return widget; - } - /** * Change the state of all symbol from the list symbols * @parm symbols all symbols @@ -1174,24 +1096,6 @@ /** - * Return a map with the filesystem definitions for the map new_val - * @parm new_val map that contains a partition - * @parm file_systems filesystem definitions - * @return map - */ -define map GetFirstFilesystemDefinition( integer fsid, map<symbol,map> file_systems ) - ``{ - map<symbol,map> define_map = filter( symbol key, map val, file_systems, - ``(fsid == val[`fsid]:Partitions::fsid_native )); - list<map> define_list = maplist( symbol k, map v , define_map, ``( v )); - if( size( define_list ) == 0) - return $[]; - else - return define_list[0]:$[]; - } - - - /** * Dialogpart: Mount part * @parm new_val map that contains a partition * @parm file_systems filesystem definitions -- 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] r52706 - /tags/stable-2_17_7/nfs-client/
by kmachalkova＠svn.opensuse.org 29 Oct '08

29 Oct '08

Author: kmachalkova Date: Wed Oct 29 18:17:21 2008 New Revision: 52706 URL: http://svn.opensuse.org/viewcvs/yast?rev=52706&view=rev Log: Created tag stable-2_17_7 for nfs-client Added: tags/stable-2_17_7/nfs-client/ - copied from r52705, trunk/nfs-client/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0