July 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r62286 - /trunk/ldap-server/package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 22 Jul '10

22 Jul '10

Author: rhafer Date: Thu Jul 22 12:06:31 2010 New Revision: 62286 URL: http://svn.opensuse.org/viewcvs/yast?rev=62286&view=rev Log: Updated changelog Modified: trunk/ldap-server/package/yast2-ldap-server.changes Modified: trunk/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/package/yast2-ldap-s… ============================================================================== --- trunk/ldap-server/package/yast2-ldap-server.changes (original) +++ trunk/ldap-server/package/yast2-ldap-server.changes Thu Jul 22 12:06:31 2010 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Jul 22 10:05:25 UTC 2010 - rhafer(a)novell.com + +- Create LDAP Base objects only after ldap.conf has be written + (bnc#619549) + +------------------------------------------------------------------- Tue Jul 6 12:30:23 UTC 2010 - rhafer(a)novell.com - Write tls_cacert option to ldap.conf (bnc#619549) -- 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] r62285 - /trunk/ldap-server/src/LdapServer.pm
by rhafer＠svn.opensuse.org 22 Jul '10

22 Jul '10

Author: rhafer Date: Thu Jul 22 12:04:25 2010 New Revision: 62285 URL: http://svn.opensuse.org/viewcvs/yast?rev=62285&view=rev Log: Create LDAP base object after writing /etc/openldap/ldap.conf to avoid libldap initialization issues (bnc#619549) Modified: trunk/ldap-server/src/LdapServer.pm Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Thu Jul 22 12:04:25 2010 @@ -799,11 +799,6 @@ return 0; } Progress->NextStage(); - $self->CreateBaseObjects(); - if ( $setupSyncreplMaster ) - { - $self->CreateSyncReplAccount(); - } if ( $write_ldapconf ) { y2milestone("Updating /etc/openldap/ldap.conf"); @@ -819,6 +814,11 @@ } SCR->Write(".etc.ldap_conf", "force" ); } + $self->CreateBaseObjects(); + if ( $setupSyncreplMaster ) + { + $self->CreateSyncReplAccount(); + } if (! $usesBackConfig ) { SCR->Execute('.target.bash', 'cp -f /etc/openldap/slapd.conf /etc/openldap/slapd.conf.YaSTsave' ); -- 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] r62284 - /tags/branch-Code-11-SP1-2_17_35/ldap-server/
by rhafer＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: rhafer Date: Tue Jul 20 17:07:18 2010 New Revision: 62284 URL: http://svn.opensuse.org/viewcvs/yast?rev=62284&view=rev Log: Created tag branch-Code-11-SP1-2_17_35 for ldap-server Added: tags/branch-Code-11-SP1-2_17_35/ldap-server/ (props changed) - copied from r62283, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- 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] r62283 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: rhafer Date: Tue Jul 20 17:06:38 2010 New Revision: 62283 URL: http://svn.opensuse.org/viewcvs/yast?rev=62283&view=rev Log: preparing 2.17.35 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Tue Jul 20 17:06:38 2010 @@ -1 +1 @@ -2.17.34 +2.17.35 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Tue Jul 20 17:06:38 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Jul 20 14:48:59 UTC 2010 - rhafer(a)novell.com + +- Version 2.17.35 +- Fixed an API incompatiblity between sle11-ga and sle11-sp1 which + caused yast2-kerberos-server to fail (bnc#619548) + +------------------------------------------------------------------- Fri Mar 12 12:57:46 UTC 2010 - rhafer(a)novell.com - Version 2.17.34 -- 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] r62282 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: ./ src/LdapDatabase.ycp src/LdapServer.pm src/dialogs.ycp src/ldap-server_proposal.ycp
by rhafer＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: rhafer Date: Tue Jul 20 16:48:33 2010 New Revision: 62282 URL: http://svn.opensuse.org/viewcvs/yast?rev=62282&view=rev Log: - Renamed ReadInitialDefaults() back to CreateInitialDefaults() to stay backwards compatible with sle11-ga (bnc#619548). Merged from trunk. Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/ (props changed) branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapDatabase.ycp Tue Jul 20 16:48:33 2010 @@ -148,7 +148,7 @@ boolean append_checked = true; if ( createDefaults ) { - db = LdapServer::ReadInitialDefaults(); + db = LdapServer::CreateInitialDefaults(); } else { Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/LdapServer.pm Tue Jul 20 16:48:33 2010 @@ -1570,10 +1570,10 @@ # # @return A Map containing the setting to use when creating the initial setup # -BEGIN { $TYPEINFO {ReadInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub ReadInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("ReadInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -1759,6 +1759,7 @@ $self->ChangeDatabaseIndex(1, $idx ); } } + $self->WriteLdapConfBase($database->{'suffix'}); if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) { Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/dialogs.ycp Tue Jul 20 16:48:33 2010 @@ -206,7 +206,7 @@ any EnableServiceDialog() { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], "display_details": true, @@ -1075,7 +1075,7 @@ } else { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); defaults["configpw"] = pw; LdapServer::SetInitialDefaults(defaults); break; Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Jul 20 16:48:33 2010 @@ -73,7 +73,7 @@ { LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); @@ -86,7 +86,7 @@ if( LdapServer::ReadServiceEnabled() ) { string rootPWString = ""; - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); if (! LdapServer::ReadSetupSlave() ) { if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) @@ -250,7 +250,7 @@ } } LdapServer::ReadFromDefaults(); - map <string,any> defaults = LdapServer::ReadInitialDefaults(); + map <string,any> defaults = LdapServer::CreateInitialDefaults(); Progress::set(false); Ldap::Read(); Progress::set(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] r62281 - /trunk/storage/storage/src/modules/StorageFields.ycp
by aschnell＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: aschnell Date: Tue Jul 20 15:27:42 2010 New Revision: 62281 URL: http://svn.opensuse.org/viewcvs/yast?rev=62281&view=rev Log: - updated help text Modified: trunk/storage/storage/src/modules/StorageFields.ycp Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Jul 20 15:27:42 2010 @@ -375,7 +375,7 @@ case `parity_algorithm: // helptext for table column and overview entry ret = ret + _("Parity Algorithm shows the parity -algorithm for RAID devices with RAID type 5."); +algorithm for RAID devices with RAID type 5, 6 or 10."); break; case `pe_size: -- 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] r62280 - /tags/branch-Code-11-SP1-2_17_18/samba-client/
by jsuchome＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: jsuchome Date: Tue Jul 20 12:21:27 2010 New Revision: 62280 URL: http://svn.opensuse.org/viewcvs/yast?rev=62280&view=rev Log: Created tag branch-Code-11-SP1-2_17_18 for samba-client Added: tags/branch-Code-11-SP1-2_17_18/samba-client/ (props changed) - copied from r62279, branches/SuSE-Code-11-SP1-Branch/samba-client/ -- 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] r62279 - in /branches/SuSE-Code-11-SP1-Branch/samba-client: VERSION package/yast2-samba-client.changes src/SambaAD.pm src/routines.ycp src/samba-client.ycp
by jsuchome＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: jsuchome Date: Tue Jul 20 12:21:21 2010 New Revision: 62279 URL: http://svn.opensuse.org/viewcvs/yast?rev=62279&view=rev Log: - tell kerberos client not to check for DNS when saving AD configuration (bnc#622235) - fixed joining from CLI - added API for setting the realm - 2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaAD.pm branches/SuSE-Code-11-SP1-Branch/samba-client/src/routines.ycp branches/SuSE-Code-11-SP1-Branch/samba-client/src/samba-client.ycp Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/VERSION Tue Jul 20 12:21:21 2010 @@ -1 +1 @@ -2.17.17 +2.17.18 Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/package/yast2-samba-client.changes Tue Jul 20 12:21:21 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Thu Jul 15 08:54:37 CEST 2010 - jsuchome(a)suse.cz + +- tell kerberos client not to check for DNS when saving AD + configuration (bnc#622235) +- fixed joining from CLI +- added API for setting the realm +- 2.17.18 + +------------------------------------------------------------------- Thu Apr 1 13:06:50 CEST 2010 - jsuchome(a)suse.cz - allow editing Machine Account OU in autoYaST config (bnc#581347) Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaAD.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaAD.pm (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/src/SambaAD.pm Tue Jul 20 12:21:21 2010 @@ -315,6 +315,19 @@ return $realm; } +# set the new value of realm +# return true if the new value is different from the previous one +BEGIN{$TYPEINFO{SetRealm}=["function","boolean","string"]} +sub SetRealm { + my ($self, $new_realm) = @_; + if ($new_realm eq $realm) { + return FALSE; + } + $realm = $new_realm; + return TRUE; +} + + # Change samba configuration file (/etc/samba/smb.conf) # # @param status a new status @@ -373,6 +386,7 @@ "trusted_servers" => $ads } }); + Kerberos->dns_used (FALSE); Kerberos->modified (TRUE); Kerberos->Write (); Progress->set ($prev); Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/src/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/src/routines.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/src/routines.ycp Tue Jul 20 12:21:21 2010 @@ -116,7 +116,7 @@ "user" : user, "password" : pass ] : nil; - if (SambaAD::ADS () != "" && ret == `ok) + if (SambaAD::ADS () != "" && ret == `ok && what != `leave) { string machine = (string)UI::QueryWidget (`id (`machines), `Value); if (machine != default_id) Modified: branches/SuSE-Code-11-SP1-Branch/samba-client/src/samba-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/samba… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/samba-client/src/samba-client.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/samba-client/src/samba-client.ycp Tue Jul 20 12:21:21 2010 @@ -61,6 +61,7 @@ SambaAD::ReadADS (domain); if (SambaAD::ADS () != "") { + domain = SambaAD::GetWorkgroup (domain); SambaAD::ReadRealm (); } @@ -102,6 +103,7 @@ SambaAD::ReadADS (domain); if (SambaAD::ADS () != "") { + domain = SambaAD::GetWorkgroup (domain); SambaAD::ReadRealm (); } -- 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] r62278 - in /trunk/storage/storage/src/modules: Storage.ycp StorageFields.ycp
by fehr＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: fehr Date: Tue Jul 20 12:07:01 2010 New Revision: 62278 URL: http://svn.opensuse.org/viewcvs/yast?rev=62278&view=rev Log: - add function HasRaidParity to Storage.ycp - use rev_conv_parstring to get parity string values Modified: trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageFields.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 Tue Jul 20 12:07:01 2010 @@ -1360,6 +1360,11 @@ return p; } +global boolean HasRaidParity( string rt ) + { + return( contains( [ "raid5", "raid6", "raid10" ], rt )); + } + map getContainerInfo( map c ) { y2milestone( "getContainerInfo %1", c ); @@ -1469,13 +1474,13 @@ integer t = LibStorage::MdPartCoInfo::swig_type_get(infos); c["raid_type"] = substring(sformat("%1", toSymbol(conv_mdtype, t)), 1); - if (c["raid_type"]:"" == "raid5") - { + if( HasRaidParity( c["raid_type"]:"" )) + { t = LibStorage::MdPartCoInfo::swig_parity_get(infos); symbol pt = toSymbol(conv_mdparity, t); - if (pt != `par_none) - c["parity_algorithm"] = substring(sformat("%1", pt), 1); - } + if( pt != `par_default ) + c["parity_algorithm"] = rev_conv_parstring[t]:""; + } t = LibStorage::MdPartCoInfo::swig_chunkSizeK_get(infos); if (t > 0) { @@ -1549,12 +1554,12 @@ p["nr"] = LibStorage::MdInfo::swig_nr_get(info); integer t = LibStorage::MdInfo::swig_type_get(info); p["raid_type"] = substring( sformat( "%1", toSymbol( conv_mdtype, t )), 1 ); - if( p["raid_type"]:""=="raid5" ) + if( HasRaidParity( p["raid_type"]:"" )) { t = LibStorage::MdInfo::swig_parity_get(info); symbol pt = toSymbol( conv_mdparity, t ); - if( pt != `par_none ) - p["parity_algorithm"] = substring( sformat( "%1", pt), 1 ); + if( pt != `par_default ) + p["parity_algorithm"] = rev_conv_parstring[t]:""; } p["type"] = `sw_raid; p["fstype"] = Partitions::raid_name; @@ -2962,7 +2967,7 @@ ret = Storage::CreateMd( p["nr"]:0, p["raid_type"]:"raid1" ); if( ret && haskey( p, "chunk_size" )) Storage::ChangeMdChunk( p["nr"]:0, p["chunk_size"]:4 ); - if( ret && p["raid_type"]:""=="raid5" && + if( ret && HasRaidParity( p["raid_type"]:"" ) && haskey( p, "parity_algorithm" )) Storage::ChangeMdParity( p["nr"]:0, p["parity_algorithm"]:"" ); Modified: trunk/storage/storage/src/modules/StorageFields.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageFields.ycp (original) +++ trunk/storage/storage/src/modules/StorageFields.ycp Tue Jul 20 12:07:01 2010 @@ -807,7 +807,8 @@ case `chunk_size: { string value = ""; - if (contains(["raid0", "raid5"], data["raid_type"]:"")) { + if (data["raid_type"]:""=="raid0" || + Storage::HasRaidParity(data["raid_type"]:"")) { integer chunksize = data["chunk_size"]:0; value = Storage::KByteToHumanStringOmitZeroes(chunksize); } @@ -821,7 +822,7 @@ case `parity_algorithm: { string value = ""; - if (contains(["raid5"], data["raid_type"]:"")) { + if (Storage::HasRaidParity(data["raid_type"]:"")) { value = data["parity_algorithm"]:""; value = mergestring(splitstring(value, "_"), "-"); } -- 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] r62277 - in /trunk/storage: package/yast2-storage.changes storage/src/include/ep-raid-dialogs.ycp storage/src/include/ep-raid-lib.ycp storage/src/modules/Storage.ycp
by fehr＠svn.opensuse.org 20 Jul '10

20 Jul '10

Author: fehr Date: Tue Jul 20 11:33:39 2010 New Revision: 62277 URL: http://svn.opensuse.org/viewcvs/yast?rev=62277&view=rev Log: add support for additional parity values for raid5, raid6, raid10 Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/ep-raid-dialogs.ycp trunk/storage/storage/src/include/ep-raid-lib.ycp trunk/storage/storage/src/modules/Storage.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Jul 20 11:33:39 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jul 20 11:26:30 CEST 2010 - fehr(a)suse.de + +- add support for additional parity values for raid5, raid6, raid10 + +------------------------------------------------------------------- Wed Jul 14 10:12:46 CEST 2010 - aschnell(a)suse.de - improved help text (bnc #506814) Modified: trunk/storage/storage/src/include/ep-raid-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-dialogs.ycp Tue Jul 20 11:33:39 2010 @@ -206,15 +206,23 @@ 32 kB is a good starting point. For RAID 1, the chunk size does not affect the array very much. "); - if (raid_type == "raid5") + if (raid_type == "raid5" || raid_type == "raid6") // helptext - helptext = helptext + _("Parity Algorithm: The parity algorithm to use with RAID5. + helptext = helptext + _("Parity Algorithm: The parity algorithm to use with RAID5/6. Left-symmetric is the one that offers maximum performance on typical disks with rotating platters. "); return helptext; } + list<term> getParTerms( string mdtype, integer sz ) + { + list<list> pars = Storage::AllowdParity( mdtype, sz ); + return( maplist( list e, pars, + ``{ + return( `item( `id(e[0]:`par_default), e[1]:"" )); + })); + } symbol MiniWorkflowStepRaidOptions(map<string, any> &data) { @@ -222,7 +230,7 @@ string raid_type = data["raid_type"]:"error"; integer chunk_size = (data["chunk_size_k"]:DefaultChunkSizeK(raid_type))*1024; - symbol parity_algorithm = data["parity_algorithm"]:`left_asymmetric; + symbol parity_algorithm = data["parity_algorithm"]:`par_default; list<term> chunk_sizes_list = maplist(integer i, Integer::RangeFrom(11, 22), { return `item(`id(2 << i), Storage::ByteToHumanStringOmitZeroes(2 << i)); @@ -233,15 +241,14 @@ `id(chunk_size))) ); - if (raid_type == "raid5") + list<term> par_list = getParTerms( raid_type, size(data["devices"]:[])); + + if (size(par_list)>0) options = add(options, `Left(`ComboBoxSelected(`id(`parity_algorithm), `opt(`hstretch), // combo box label _("Parity &Algorithm"), - [ `item(`id(`left_asymmetric), "left-asymmetric"), - `item(`id(`left_symmetric), "left-symmetric"), - `item(`id(`right_asymmetric), "right-asymmetric"), - `item(`id(`right_symmetric), "right-symmetric") ], + par_list, `id(parity_algorithm))) ); Modified: trunk/storage/storage/src/include/ep-raid-lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-r… ============================================================================== --- trunk/storage/storage/src/include/ep-raid-lib.ycp (original) +++ trunk/storage/storage/src/include/ep-raid-lib.ycp Tue Jul 20 11:33:39 2010 @@ -71,10 +71,11 @@ integer chunk_size_k = data["chunk_size_k"]:4; Storage::ChangeMdChunk(nr, chunk_size_k); - if (raid_type == `raid5) { - symbol parity_algorithm = data["parity_algorithm"]:`left_asymmetric; + if( haskey( data, "parity_algorithm" )) + { + symbol parity_algorithm = data["parity_algorithm"]:`par_default; Storage::ChangeMdParitySymbol(nr, parity_algorithm); - } + } Storage::ChangeVolumeProperties(data); 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 Tue Jul 20 11:33:39 2010 @@ -163,20 +163,51 @@ "multipath" : LibStorage::MULTIPATH() ]; map<string,any> conv_mdparity = - $[ "def_sym" : `par_none, - "def_int" : LibStorage::PAR_NONE(), + $[ "def_sym" : `par_default, + "def_int" : LibStorage::PAR_DEFAULT(), "m" : $[ LibStorage::LEFT_ASYMMETRIC() : `left_asymmetric, LibStorage::LEFT_SYMMETRIC() : `left_symmetric, LibStorage::RIGHT_ASYMMETRIC() : `right_asymmetric, - LibStorage::RIGHT_SYMMETRIC() : `right_symmetric + LibStorage::RIGHT_SYMMETRIC() : `right_symmetric, + LibStorage::PAR_FIRST() : `par_first, + LibStorage::PAR_LAST() : `par_last, + LibStorage::LEFT_ASYMMETRIC_6() : `left_asymmetric_6, + LibStorage::LEFT_SYMMETRIC_6() : `left_symmetric_6, + LibStorage::RIGHT_ASYMMETRIC_6() : `right_asymmetric_6, + LibStorage::RIGHT_SYMMETRIC_6() : `right_symmetric_6, + LibStorage::PAR_FIRST_6() : `par_first_6, + LibStorage::PAR_NEAR_2() : `par_near_2, + LibStorage::PAR_OFFSET_2() : `par_offset_2, + LibStorage::PAR_FAR_2() : `par_far_2, + LibStorage::PAR_NEAR_3() : `par_near_3, + LibStorage::PAR_OFFSET_3() : `par_offset_3, + LibStorage::PAR_FAR_3() : `par_far_3 ] ]; map<string,integer> conv_parstring = - $[ "left_asymmetric" : LibStorage::LEFT_ASYMMETRIC(), + $[ "default" : LibStorage::PAR_DEFAULT(), + "left_asymmetric" : LibStorage::LEFT_ASYMMETRIC(), "left_symmetric" : LibStorage::LEFT_SYMMETRIC(), "right_asymmetric" : LibStorage::RIGHT_ASYMMETRIC(), - "right_symmetric" : LibStorage::RIGHT_SYMMETRIC() ]; + "right_symmetric" : LibStorage::RIGHT_SYMMETRIC(), + "parity_first" : LibStorage::PAR_FIRST(), + "parity_last" : LibStorage::PAR_LAST(), + "left_asymmetric_6" : LibStorage::LEFT_ASYMMETRIC_6(), + "left_symmetric_6" : LibStorage::LEFT_SYMMETRIC_6(), + "right_asymmetric_6" : LibStorage::RIGHT_ASYMMETRIC_6(), + "right_symmetric_6" : LibStorage::RIGHT_SYMMETRIC_6(), + "parity_first_6" : LibStorage::PAR_FIRST_6(), + "n2" : LibStorage::PAR_NEAR_2(), + "o2" : LibStorage::PAR_OFFSET_2(), + "f2" : LibStorage::PAR_FAR_2(), + "n3" : LibStorage::PAR_NEAR_3(), + "o3" : LibStorage::PAR_OFFSET_3(), + "f3" : LibStorage::PAR_FAR_3() + ]; + +map<integer,string> rev_conv_parstring = + mapmap( string s, integer i, conv_parstring, {return$[ i: s ];}); map<string,any> conv_partalign = $[ "def_sym" : `align_optimal, @@ -5665,4 +5696,16 @@ return ret; } +global list<list> AllowdParity( string mdtype, integer sz ) + { + integer mdt = conv_mdstring[mdtype]:0; + list<integer> pars = + LibStorage::StorageInterface::getMdAllowedParity(sint, mdt, sz ); + list<list> ret = maplist( integer i, pars, + {return( [ toSymbol(conv_mdparity, i), + rev_conv_parstring[i]:"" ] );}); + y2milestone( "ret:%1", ret ); + 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