January 2012 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r67266 - /tags/stable-2_22_0/nis-client/
by jsuchome＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: jsuchome Date: Tue Jan 24 17:20:13 2012 New Revision: 67266 URL: http://svn.opensuse.org/viewcvs/yast?rev=67266&view=rev Log: Created tag stable-2_22_0 for nis-client Added: tags/stable-2_22_0/nis-client/ - copied from r67265, trunk/nis-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] r67265 - in /trunk/nis-client: VERSION package/yast2-nis-client.changes src/Nis.ycp src/nis-client.ycp src/nis.ycp src/nis_auto.ycp src/ui.ycp yast2-nis-client.spec.in
by jsuchome＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: jsuchome Date: Tue Jan 24 17:19:26 2012 New Revision: 67265 URL: http://svn.opensuse.org/viewcvs/yast?rev=67265&view=rev Log: - confirmed license - 2.22.0 Modified: trunk/nis-client/VERSION trunk/nis-client/package/yast2-nis-client.changes trunk/nis-client/src/Nis.ycp trunk/nis-client/src/nis-client.ycp trunk/nis-client/src/nis.ycp trunk/nis-client/src/nis_auto.ycp trunk/nis-client/src/ui.ycp trunk/nis-client/yast2-nis-client.spec.in Modified: trunk/nis-client/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/VERSION?rev=67265&r1=… ============================================================================== --- trunk/nis-client/VERSION (original) +++ trunk/nis-client/VERSION Tue Jan 24 17:19:26 2012 @@ -1 +1 @@ -2.21.5 +2.22.0 Modified: trunk/nis-client/package/yast2-nis-client.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/package/yast2-nis-cli… ============================================================================== --- trunk/nis-client/package/yast2-nis-client.changes (original) +++ trunk/nis-client/package/yast2-nis-client.changes Tue Jan 24 17:19:26 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 24 17:18:47 CET 2012 - jsuchome(a)suse.cz + +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Fri Nov 25 12:22:45 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/nis-client/src/Nis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/Nis.ycp?rev=67265… ============================================================================== --- trunk/nis-client/src/Nis.ycp (original) +++ trunk/nis-client/src/Nis.ycp Tue Jan 24 17:19:26 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * modules/Nis.ycp Modified: trunk/nis-client/src/nis-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/nis-client.ycp?re… ============================================================================== --- trunk/nis-client/src/nis-client.ycp (original) +++ trunk/nis-client/src/nis-client.ycp Tue Jan 24 17:19:26 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * Author: Martin Vidner <mvidner(a)suse.cz> * Summary: Just a redirection Modified: trunk/nis-client/src/nis.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/nis.ycp?rev=67265… ============================================================================== --- trunk/nis-client/src/nis.ycp (original) +++ trunk/nis-client/src/nis.ycp Tue Jan 24 17:19:26 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * nis.ycp Modified: trunk/nis-client/src/nis_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/nis_auto.ycp?rev=… ============================================================================== --- trunk/nis-client/src/nis_auto.ycp (original) +++ trunk/nis-client/src/nis_auto.ycp Tue Jan 24 17:19:26 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: clients/nis_auto.ycp * Package: nis-client configuration Modified: trunk/nis-client/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/src/ui.ycp?rev=67265&… ============================================================================== --- trunk/nis-client/src/ui.ycp (original) +++ trunk/nis-client/src/ui.ycp Tue Jan 24 17:19:26 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /** * File: * include/nis/ui.ycp Modified: trunk/nis-client/yast2-nis-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/nis-client/yast2-nis-client.spec… ============================================================================== --- trunk/nis-client/yast2-nis-client.spec.in (original) +++ trunk/nis-client/yast2-nis-client.spec.in Tue Jan 24 17:19:26 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: gcc-c++ perl-XML-Writer doxygen yast2-devtools yast2-core-devel yast2 yast2-testsuite yast2-pam update-desktop-files libtool # Wizard::SetDesktopTitleAndIcon Requires: yast2 >= 2.21.22 -- 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] r67264 - /tags/stable-2_22_0/ldap/
by jsuchome＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: jsuchome Date: Tue Jan 24 17:12:23 2012 New Revision: 67264 URL: http://svn.opensuse.org/viewcvs/yast?rev=67264&view=rev Log: Created tag stable-2_22_0 for ldap Added: tags/stable-2_22_0/ldap/ - copied from r67263, trunk/ldap/ -- 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] r67263 - in /trunk/ldap: VERSION package/yast2-ldap.changes src/LdapAgent.cc src/LdapAgent.h src/LdapServerAccess.pm src/Y2CCLdapAgent.cc yast2-ldap.spec.in
by jsuchome＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: jsuchome Date: Tue Jan 24 17:12:02 2012 New Revision: 67263 URL: http://svn.opensuse.org/viewcvs/yast?rev=67263&view=rev Log: - confirmed license - 2.22.0 Modified: trunk/ldap/VERSION trunk/ldap/package/yast2-ldap.changes trunk/ldap/src/LdapAgent.cc trunk/ldap/src/LdapAgent.h trunk/ldap/src/LdapServerAccess.pm trunk/ldap/src/Y2CCLdapAgent.cc trunk/ldap/yast2-ldap.spec.in Modified: trunk/ldap/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/VERSION?rev=67263&r1=67262&… ============================================================================== --- trunk/ldap/VERSION (original) +++ trunk/ldap/VERSION Tue Jan 24 17:12:02 2012 @@ -1 +1 @@ -2.21.1 +2.22.0 Modified: trunk/ldap/package/yast2-ldap.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/package/yast2-ldap.changes?… ============================================================================== --- trunk/ldap/package/yast2-ldap.changes (original) +++ trunk/ldap/package/yast2-ldap.changes Tue Jan 24 17:12:02 2012 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 24 17:09:51 CET 2012 - jsuchome(a)suse.cz + +- confirmed license +- 2.22.0 + +------------------------------------------------------------------- Fri Nov 25 12:21:42 UTC 2011 - coolo(a)suse.com - add libtool as buildrequire to avoid implicit dependency Modified: trunk/ldap/src/LdapAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapAgent.cc?rev=67263&… ============================================================================== --- trunk/ldap/src/LdapAgent.cc (original) +++ trunk/ldap/src/LdapAgent.cc Tue Jan 24 17:12:02 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /* LdapAgent.cc * * An agent for reading the ldap configuration file. Modified: trunk/ldap/src/LdapAgent.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapAgent.h?rev=67263&r… ============================================================================== --- trunk/ldap/src/LdapAgent.h (original) +++ trunk/ldap/src/LdapAgent.h Tue Jan 24 17:12:02 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /* LdapAgent.h * * Ldap agent implementation Modified: trunk/ldap/src/LdapServerAccess.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/LdapServerAccess.pm?rev… ============================================================================== --- trunk/ldap/src/LdapServerAccess.pm (original) +++ trunk/ldap/src/LdapServerAccess.pm Tue Jan 24 17:12:02 2012 @@ -1,4 +1,24 @@ #! /usr/bin/perl -w +# ------------------------------------------------------------------------------ +# Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. +# +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# this program; if not, contact Novell, Inc. +# +# To contact Novell about this file by physical or electronic mail, you may find +# current contact information at www.novell.com. +# ------------------------------------------------------------------------------ +#/ + # # File: modules/LdapServerAccess.pm # Package: Low-level LDAP configuration (agent, etc.) Modified: trunk/ldap/src/Y2CCLdapAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/src/Y2CCLdapAgent.cc?rev=67… ============================================================================== --- trunk/ldap/src/Y2CCLdapAgent.cc (original) +++ trunk/ldap/src/Y2CCLdapAgent.cc Tue Jan 24 17:12:02 2012 @@ -1,3 +1,23 @@ +/* ------------------------------------------------------------------------------ + * Copyright (c) 2006-2012 Novell, Inc. All Rights Reserved. + * + * + * This program is free software; you can redistribute it and/or modify it under + * the terms of version 2 of the GNU General Public License as published by the + * Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * this program; if not, contact Novell, Inc. + * + * To contact Novell about this file by physical or electronic mail, you may find + * current contact information at www.novell.com. + * ------------------------------------------------------------------------------ + */ + /* Y2CCLdapAgent.cc * * Ldap agent implementation Modified: trunk/ldap/yast2-ldap.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap/yast2-ldap.spec.in?rev=6726… ============================================================================== --- trunk/ldap/yast2-ldap.spec.in (original) +++ trunk/ldap/yast2-ldap.spec.in Tue Jan 24 17:12:02 2012 @@ -1,8 +1,8 @@ @HEADER-COMMENT@ @HEADER@ -Group: System/YaST -License: GPL-2.0+ +Group: System/YaST +License: GPL-2.0 BuildRequires: gcc-c++ libldapcpp-devel libxcrypt-devel yast2-devtools doxygen yast2-core-devel yast2 libtool Summary: YaST2 - LDAP Agent Requires: ldapcpplib yast2 -- 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] r67262 - in /trunk/network: ./ VERSION package/yast2-network.changes src/clients/lan_auto.ycp src/routines/routines.ycp
by mvidner＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: mvidner Date: Tue Jan 24 16:44:43 2012 New Revision: 67262 URL: http://svn.opensuse.org/viewcvs/yast?rev=67262&view=rev Log: - Fixed broken autoyast in general (bnc#742855) and in case with keep_install_network without dns without routing (bnc#712864). - Filter out more Chelsio devices, by PCI id (bnc#711432#c83) merged from SLE11-SP2 Modified: trunk/network/ (props changed) trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/lan_auto.ycp trunk/network/src/routines/routines.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=67262&r1=672… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Tue Jan 24 16:44:43 2012 @@ -1 +1 @@ -2.22.1 +2.22.2 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Tue Jan 24 16:44:43 2012 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Jan 24 16:28:37 CET 2012 - mvidner(a)suse.cz + +- Fixed broken autoyast in general (bnc#742855) + and in case with keep_install_network without dns without routing + (bnc#712864). +- Filter out more Chelsio devices, by PCI id (bnc#711432#c83) +- 2.22.2 + +------------------------------------------------------------------- Thu Jan 12 15:52:47 CET 2012 - mvidner(a)suse.cz - AY keep_install_network: merge dns and routing from linuxrc Modified: trunk/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/lan_auto.ycp… ============================================================================== --- trunk/network/src/clients/lan_auto.ycp (original) +++ trunk/network/src/clients/lan_auto.ycp Tue Jan 24 16:44:43 2012 @@ -297,18 +297,24 @@ Lan::Read(`cache); // export settings into AY map map from_system=Lan::Export(); - map dns = from_system["dns"]:$[]; - map routing = from_system["routing"]:$[]; + map<string, any> dns = from_system["dns"]:$[]; + map<string, any> routing = from_system["routing"]:$[]; // copy the keys/values that are not existing in the XML // so we merge the inst-sys settings with the XML while XML // has higher priority + if (! haskey(param, "dns")) { + param["dns"] = $[]; + } foreach( string key, any value, dns, { if( ! haskey( param["dns"]:$[], key ) ) { y2milestone("(dns) taking %1 from inst-sys. Value = %2", key, value); param["dns",key] = value; } }); + if (! haskey(param, "routing")) { + param["routing"] = $[]; + } foreach( string key, any value, routing, { if( ! haskey( param["routing"]:$[], key ) ) { param["routing",key] = value; Modified: trunk/network/src/routines/routines.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/routines/routines.yc… ============================================================================== --- trunk/network/src/routines/routines.ycp (original) +++ trunk/network/src/routines/routines.ycp Tue Jan 24 16:44:43 2012 @@ -750,8 +750,9 @@ card_ok=false; y2milestone("Filtering out virtio device without device file."); } - // filter out device with chelsio Driver and no Device File (bnc#711432) - if (one["module"]:""=="cxgb4" && one["dev_name"]:""==""){ + // filter out device with chelsio Driver and no Device File or which cannot networking(bnc#711432) + if ((one["module"]:""=="cxgb4" && one["dev_name"]:""=="") || + (card["vendor_id"]:0==0x11425 && card["device_id"]:0 == 0x14102)){ // 0x10000 for PCI and 0x4102 is device id of device and 0x1425 for chelsio inc card_ok=false; y2milestone("Filtering out Chelsio device without device file."); } -- 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] r67261 - in /branches/SuSE-Code-11-SP2-Branch/network: VERSION package/yast2-network.changes src/clients/lan_auto.ycp
by mvidner＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: mvidner Date: Tue Jan 24 16:28:57 2012 New Revision: 67261 URL: http://svn.opensuse.org/viewcvs/yast?rev=67261&view=rev Log: Fixed broken autoyast in general (bnc#742855) and in case with keep_install_network without dns without routing (bnc#712864). Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Modified: branches/SuSE-Code-11-SP2-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/network/VERSION Tue Jan 24 16:28:57 2012 @@ -1 +1 @@ -2.17.167 +2.17.168 Modified: branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/network/package/yast2-network.changes Tue Jan 24 16:28:57 2012 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jan 24 16:28:37 CET 2012 - mvidner(a)suse.cz + +- Fixed broken autoyast in general (bnc#742855) + and in case with keep_install_network without dns without routing + (bnc#712864). +- 2.17.168 + +------------------------------------------------------------------- Mon Jan 23 14:15:33 CET 2012 - mvidner(a)suse.cz - Filter out more Chelsio devices, by PCI id (bnc#711432#c83) Modified: branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/netwo… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/network/src/clients/lan_auto.ycp Tue Jan 24 16:28:57 2012 @@ -295,18 +295,24 @@ Lan::Read(`cache); // export settings into AY map map from_system=Lan::Export(); - map dns = from_system["dns"]:$[]; - map routing = from_system["routing"]:$[]; + map<string, any> dns = from_system["dns"]:$[]; + map<string, any> routing = from_system["routing"]:$[]; // copy the keys/values that are not existing in the XML // so we merge the inst-sys settings with the XML while XML // has higher priority + if (! haskey(param, "dns")) { + param["dns"] = $[]; + } foreach( string key, any value, dns, { if( ! haskey( param["dns"]:$[], key ) ) { y2milestone("(dns) taking %1 from inst-sys. Value = %2", key, value); param["dns",key] = value; } }); + if (! haskey(param, "routing")) { + param["routing"] = $[]; + } foreach( string key, any value, routing, { if( ! haskey( param["routing"]:$[], key ) ) { param["routing",key] = 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] r67260 - in /branches/SuSE-Code-11-SP2-Branch/storage: libstorage/src/ package/ storage/src/modules/
by aschnell＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: aschnell Date: Tue Jan 24 14:33:04 2012 New Revision: 67260 URL: http://svn.opensuse.org/viewcvs/yast?rev=67260&view=rev Log: - do not query user to autostart multipath in AutoYaST (bnc#742913) Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.cc Tue Jan 24 14:33:04 2012 @@ -128,6 +128,14 @@ lengthof(imsm_driver_names)); + static const string multipath_autostart_names[] = { + "UNDECIDED", "ON", "OFF" + }; + + const vector<string> EnumInfo<MultipathAutostart>::names(multipath_autostart_names, multipath_autostart_names + + lengthof(multipath_autostart_names)); + + // strings must match "parted --align" option static const string part_align_names[] = { "optimal", "cylinder" Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Enum.h Tue Jan 24 14:33:04 2012 @@ -52,6 +52,7 @@ template <> struct EnumInfo<CType> { static const vector<string> names; }; template <> struct EnumInfo<Transport> { static const vector<string> names; }; template <> struct EnumInfo<ImsmDriver> { static const vector<string> names; }; + template <> struct EnumInfo<MultipathAutostart> { static const vector<string> names; }; template <> struct EnumInfo<PartAlign> { static const vector<string> names; }; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.cc Tue Jan 24 14:33:04 2012 @@ -109,7 +109,7 @@ partAlignment(ALIGN_OPTIMAL), defaultMountBy(MOUNTBY_ID), defaultFs(EXT3), defaultSubvolName(""), detectMounted(true), root_mounted(!instsys()), rootprefix(), fstab(NULL), mdadm(NULL), - imsm_driver(IMSM_UNDECIDED) + imsm_driver(IMSM_UNDECIDED), multipath_autostart(MPAS_UNDECIDED) { y2mil("constructed Storage with " << env); y2mil("libstorage version " VERSION); @@ -139,6 +139,14 @@ } y2mil("imsm_driver:" << toString(imsm_driver)); + tenv = getenv("LIBSTORAGE_MULTIPATH_AUTOSTART"); + if (tenv) + { + if (!toValue(tenv, multipath_autostart, false)) + y2war("unknown multipath autostart '" << tenv << "' in environment"); + } + y2mil("multipath_autostart:" << toString(multipath_autostart)); + logSystemInfo(); } @@ -223,7 +231,9 @@ if (instsys()) { - if (decideMultipath()) + decideMultipath(); + + if (multipath_autostart == MPAS_ON) DmmultipathCo::activate(true); } @@ -488,28 +498,28 @@ } - bool + void Storage::decideMultipath() { y2mil("decideMultipath"); if (getenv("LIBSTORAGE_NO_DMMULTIPATH") != NULL) - return false; + return; - SystemCmd c(MODPROBEBIN " dm-multipath"); - - CmdMultipath cmdmultipath(true); - if (cmdmultipath.looksLikeRealMultipath()) + if (multipath_autostart == MPAS_UNDECIDED) { - // popup text - Text txt = _("The system seems to have multipath hardware.\n" - "Do you want to activate multipath?"); + SystemCmd c(MODPROBEBIN " dm-multipath"); - if (yesnoPopupCb(txt)) - return true; - } + CmdMultipath cmdmultipath(true); + if (cmdmultipath.looksLikeRealMultipath()) + { + // popup text + Text txt = _("The system seems to have multipath hardware.\n" + "Do you want to activate multipath?"); - return false; + multipath_autostart = yesnoPopupCb(txt) ? MPAS_ON : MPAS_OFF; + } + } } Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/Storage.h Tue Jan 24 14:33:04 2012 @@ -522,6 +522,8 @@ list<int> getMdAllowedParity(MdType md_type, unsigned devices ); void setImsmDriver(ImsmDriver val) { imsm_driver = val; } ImsmDriver getImsmDriver() const { return imsm_driver; } + void setMultipathAutostart(MultipathAutostart val) { multipath_autostart = val; } + MultipathAutostart getMultipathAutostart() const { return multipath_autostart; } int getMdPartCoInfo( const string& name, MdPartCoInfo& info); int getContMdPartCoInfo( const string& name, ContainerInfo& cinfo, @@ -2028,7 +2030,7 @@ void detectMds(SystemInfo& systeminfo); void detectBtrfs(SystemInfo& systeminfo); void detectMdParts(SystemInfo& systeminfo); - bool decideMultipath(); + void decideMultipath(); bool discoverMdPVols(); void detectLoops(SystemInfo& systeminfo); void detectNfs(const EtcFstab& fstab, SystemInfo& systeminfo); @@ -2123,6 +2125,7 @@ EtcMdadm* mdadm; ImsmDriver imsm_driver; + MultipathAutostart multipath_autostart; CallbackProgressBar progress_bar_cb; CallbackShowInstallInfo install_info_cb; Modified: branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/libstorage/src/StorageInterface.h Tue Jan 24 14:33:04 2012 @@ -162,6 +162,8 @@ enum ImsmDriver { IMSM_UNDECIDED, IMSM_DMRAID, IMSM_MDADM }; + enum MultipathAutostart { MPAS_UNDECIDED, MPAS_ON, MPAS_OFF }; + enum PartAlign { ALIGN_OPTIMAL, ALIGN_CYLINDER }; @@ -1041,6 +1043,20 @@ virtual ImsmDriver getImsmDriver() const = 0; /** + * Set whether multipath should be started automatically if detected. + * + * @param multipath_autostart value for automatically start of multipath. + */ + virtual void setMultipathAutostart(MultipathAutostart multipath_autostart) = 0; + + /** + * Query whether multipath should be started automatically if detected. + * + * @return value for automatically start of multipath. + */ + virtual MultipathAutostart getMultipathAutostart() const = 0; + + /** * Query all volumes found in system * * @param infos list of records that get filled with volume info Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 24 14:33:04 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 24 14:15:29 CET 2012 - aschnell(a)suse.de + +- do not query user to autostart multipath in AutoYaST (bnc#742913) + +------------------------------------------------------------------- Tue Jan 24 13:28:45 CET 2012 - fehr(a)suse.de - ensure default mountby uuid for btrfs in all cases Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 24 14:33:04 2012 @@ -371,6 +371,11 @@ { LibStorage::StorageInterface::setDetectMountedVolumes(sint, false); LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); + + if (Mode::autoinst() || Mode::autoupgrade()) + { + LibStorage::StorageInterface::setMultipathAutostart(sint, LibStorage::MPAS_OFF()); + } } conts = getContainers(); -- 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] r67259 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by aschnell＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: aschnell Date: Tue Jan 24 14:21:14 2012 New Revision: 67259 URL: http://svn.opensuse.org/viewcvs/yast?rev=67259&view=rev Log: - do not query user to autostart multipath in AutoYaST (bnc#742913) Modified: trunk/storage/package/yast2-storage.changes 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 Jan 24 14:21:14 2012 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Tue Jan 24 14:15:29 CET 2012 - aschnell(a)suse.de + +- do not query user to autostart multipath in AutoYaST (bnc#742913) + +------------------------------------------------------------------- Tue Jan 24 13:52:45 CET 2012 - fehr(a)suse.de - ensure default mountby uuid for btrfs in all cases 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 Jan 24 14:21:14 2012 @@ -371,6 +371,11 @@ { LibStorage::StorageInterface::setDetectMountedVolumes(sint, false); LibStorage::StorageInterface::setRootPrefix(sint, Installation::destdir); + + if (Mode::autoinst() || Mode::autoupgrade()) + { + LibStorage::StorageInterface::setMultipathAutostart(sint, LibStorage::MPAS_OFF()); + } } conts = getContainers(); -- 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] r67258 - in /trunk/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: fehr Date: Tue Jan 24 13:55:36 2012 New Revision: 67258 URL: http://svn.opensuse.org/viewcvs/yast?rev=67258&view=rev Log: ensure default mountby uuid for btrfs in all cases Modified: trunk/storage/package/yast2-storage.changes 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 Jan 24 13:55:36 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 24 13:52:45 CET 2012 - fehr(a)suse.de +- ensure default mountby uuid for btrfs in all cases - prevent display of outdated data with simple btrfs volumes ------------------------------------------------------------------- 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 Jan 24 13:55:36 2012 @@ -2558,6 +2558,8 @@ return( ret ); } +global symbol GetMountBy( string device ); + global boolean ChangeVolumeProperties( map part ) { integer ret = 0; @@ -2610,8 +2612,9 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } + symbol defmb = GetMountBy( dev ); if( ret==0 && size(part["mount"]:"")>0 && - part["mountby"]:`id != curr["mountby"]:`id ) + part["mountby"]:defmb != curr["mountby"]:defmb ) { changed = true; tmp = fromSymbol(conv_mountby,part["mountby"]:`device); @@ -3267,8 +3270,6 @@ } -global symbol GetMountBy( string device ); - /** * Set the flag if a disk needs to be initialized * @param string the disk to be changed @@ -3312,11 +3313,16 @@ boolean ret = true; if( IsPartType(ctype) ) { + symbol mby = GetMountBy( p["device"]:"" ); + if( p["used_fs"]:`unknown == `btrfs ) + mby = `uuid; ret = Storage::CreatePartition( d["device"]:"", p["device"]:"", p["type"]:`primary, p["fsid"]:Partitions::fsid_native, p["region",0]:0, p["region",1]:0, - p["mountby"]:GetMountBy( p["device"]:"" ) ); + p["mountby"]:mby ); + if( !haskey( p, "mountby" ) && mby!=`device ) + p["mountby"] = mby; } else if( ctype == `CT_MD ) { -- 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] r67257 - in /branches/SuSE-Code-11-SP2-Branch/storage: package/yast2-storage.changes storage/src/modules/Storage.ycp
by fehr＠svn2.opensuse.org 24 Jan '12

24 Jan '12

Author: fehr Date: Tue Jan 24 13:55:06 2012 New Revision: 67257 URL: http://svn.opensuse.org/viewcvs/yast?rev=67257&view=rev Log: ensure default mountby uuid for btrfs in all cases Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Modified: branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes Tue Jan 24 13:55:06 2012 @@ -1,6 +1,7 @@ ------------------------------------------------------------------- Tue Jan 24 13:28:45 CET 2012 - fehr(a)suse.de +- ensure default mountby uuid for btrfs in all cases - prevent display of outdated data with simple btrfs volumes - complete renaming of devs in Btrfs class (bnc#742491) - fix bug in btrfs uuid handling introduced in 2.17.124 (bnc#742491) Modified: branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/storage/src/modules/Storage.ycp Tue Jan 24 13:55:06 2012 @@ -2558,6 +2558,8 @@ return( ret ); } +global symbol GetMountBy( string device ); + global boolean ChangeVolumeProperties( map part ) { integer ret = 0; @@ -2610,8 +2612,9 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } + symbol defmb = GetMountBy( dev ); if( ret==0 && size(part["mount"]:"")>0 && - part["mountby"]:`id != curr["mountby"]:`id ) + part["mountby"]:defmb != curr["mountby"]:defmb ) { changed = true; tmp = fromSymbol(conv_mountby,part["mountby"]:`device); @@ -3267,8 +3270,6 @@ } -global symbol GetMountBy( string device ); - /** * Set the flag if a disk needs to be initialized * @param string the disk to be changed @@ -3312,11 +3313,16 @@ boolean ret = true; if( IsPartType(ctype) ) { + symbol mby = GetMountBy( p["device"]:"" ); + if( p["used_fs"]:`unknown == `btrfs ) + mby = `uuid; ret = Storage::CreatePartition( d["device"]:"", p["device"]:"", p["type"]:`primary, p["fsid"]:Partitions::fsid_native, p["region",0]:0, p["region",1]:0, - p["mountby"]:GetMountBy( p["device"]:"" ) ); + p["mountby"]:mby ); + if( !haskey( p, "mountby" ) && mby!=`device ) + p["mountby"] = mby; } else if( ctype == `CT_MD ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0