May 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64141 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:14:43 2011 New Revision: 64141 URL: http://svn.opensuse.org/viewcvs/yast?rev=64141&view=rev Log: file needed for installation workflow Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp (added) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/inst_fcoe-client.ycp Mon May 30 14:14:43 2011 @@ -0,0 +1,61 @@ +/** + * File: clients/inst_fcoe-client.ycp + * Package: Configuration of fcoe-client + * Summary: Main file + * Authors: Gabriele Mohr <gs(a)suse.de> + * + * + * File called in installation workflow for fcoe-client configuration. + */ + +{ + +/*** + * <h3>Configuration of fcoe-client</h3> + */ + +textdomain "fcoe-client"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("FCoEClient module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "ModuleLoading"; +import "Packages"; +import "Installation"; +import "String"; +include "fcoe-client/wizards.ycp"; + +/* main ui function */ +any ret = nil; + +y2milestone("fcoe-client module started during installation"); + +// TODO: check what is needed here +// - create directories (included in open-fcoe?) +// - load any modules ? +// - start fcoemon (started in FcoeClient::ServiceStatus()) + +//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); +// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); +// start iscsid daemon +// IscsiClientLib::startIScsid(); +// IscsiClientLib::autoLogOn(); + +// run dialog +ret = MainSequence(); +y2debug("MainSequence ret=%1", ret); +// add package open-iscsi to installed system +Packages::addAdditionalPackage("open-fcoe"); + +/* Finish */ +y2milestone("fcoe-client module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} -- 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] r64140 - /trunk/fcoe-client/src/inst_fcoe-client.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:13:55 2011 New Revision: 64140 URL: http://svn.opensuse.org/viewcvs/yast?rev=64140&view=rev Log: file needed for installation workflow Added: trunk/fcoe-client/src/inst_fcoe-client.ycp Added: trunk/fcoe-client/src/inst_fcoe-client.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/inst_fcoe-client… ============================================================================== --- trunk/fcoe-client/src/inst_fcoe-client.ycp (added) +++ trunk/fcoe-client/src/inst_fcoe-client.ycp Mon May 30 14:13:55 2011 @@ -0,0 +1,61 @@ +/** + * File: clients/inst_fcoe-client.ycp + * Package: Configuration of fcoe-client + * Summary: Main file + * Authors: Gabriele Mohr <gs(a)suse.de> + * + * + * File called in installation workflow for fcoe-client configuration. + */ + +{ + +/*** + * <h3>Configuration of fcoe-client</h3> + */ + +textdomain "fcoe-client"; + +/* The main () */ +y2milestone ("----------------------------------------"); +y2milestone ("FCoEClient module started"); + +import "Progress"; +import "Report"; +import "Summary"; +import "ModuleLoading"; +import "Packages"; +import "Installation"; +import "String"; +include "fcoe-client/wizards.ycp"; + +/* main ui function */ +any ret = nil; + +y2milestone("fcoe-client module started during installation"); + +// TODO: check what is needed here +// - create directories (included in open-fcoe?) +// - load any modules ? +// - start fcoemon (started in FcoeClient::ServiceStatus()) + +//SCR::Execute(.target.bash, "mkdir -p /etc/iscsi; touch /etc/iscsi/initiatorname.iscsi; ln -s /etc/iscsi/initiatorname.iscsi /etc/initiatorname.iscsi"); +// ModuleLoading::Load("iscsi_tcp", "", "", "", false, true); +// start iscsid daemon +// IscsiClientLib::startIScsid(); +// IscsiClientLib::autoLogOn(); + +// run dialog +ret = MainSequence(); +y2debug("MainSequence ret=%1", ret); +// add package open-iscsi to installed system +Packages::addAdditionalPackage("open-fcoe"); + +/* Finish */ +y2milestone("fcoe-client module finished"); +y2milestone("----------------------------------------"); + +return ret; + +/* EOF */ +} -- 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] r64139 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:12:47 2011 New Revision: 64139 URL: http://svn.opensuse.org/viewcvs/yast?rev=64139&view=rev Log: inst_fcoe-client.ycp added Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/yast2-fcoe-client.spec.in Mon May 30 14:12:47 2011 @@ -25,6 +25,7 @@ @yncludedir@/fcoe-client/* @clientdir@/fcoe-client.ycp @clientdir@/fcoe-client_*.ycp +@clientdir@/inst_fcoe-client.ycp @moduledir@/FcoeClient.* @desktopdir@/fcoe-client.desktop %dir @scrconfdir@ -- 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] r64138 - /trunk/fcoe-client/yast2-fcoe-client.spec.in
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 14:11:24 2011 New Revision: 64138 URL: http://svn.opensuse.org/viewcvs/yast?rev=64138&view=rev Log: inst_fcoe-client.ycp added Modified: trunk/fcoe-client/yast2-fcoe-client.spec.in Modified: trunk/fcoe-client/yast2-fcoe-client.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/yast2-fcoe-client.sp… ============================================================================== --- trunk/fcoe-client/yast2-fcoe-client.spec.in (original) +++ trunk/fcoe-client/yast2-fcoe-client.spec.in Mon May 30 14:11:24 2011 @@ -26,6 +26,7 @@ @yncludedir@/fcoe-client/* @clientdir@/fcoe-client.ycp @clientdir@/fcoe-client_*.ycp +@clientdir@/inst_fcoe-client.ycp @moduledir@/FcoeClient.* @desktopdir@/fcoe-client.desktop %dir @scrconfdir@ -- 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] r64137 - /tags/branch-Code-11-SP2-2_17_104/storage/
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:03:08 2011 New Revision: 64137 URL: http://svn.opensuse.org/viewcvs/yast?rev=64137&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 for storage Added: tags/branch-Code-11-SP2-2_17_104/storage/ (props changed) - copied from r64136, branches/SuSE-Code-11-SP2-Branch/storage/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r64136 - /tags/branch-Code-11-SP2-2_17_104/
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:03:04 2011 New Revision: 64136 URL: http://svn.opensuse.org/viewcvs/yast?rev=64136&view=rev Log: Created tag branch-Code-11-SP2-2_17_104 Added: tags/branch-Code-11-SP2-2_17_104/ -- 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] r64135 - in /branches/SuSE-Code-11-SP2-Branch/storage: VERSION package/yast2-storage.changes yast2-storage.spec.in
by fehr＠svn2.opensuse.org 30 May '11

30 May '11

Author: fehr Date: Mon May 30 14:02:55 2011 New Revision: 64135 URL: http://svn.opensuse.org/viewcvs/yast?rev=64135&view=rev Log: - testsuite is BuildRequires not Requires - version 2.17.104 Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION branches/SuSE-Code-11-SP2-Branch/storage/package/yast2-storage.changes branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in Modified: branches/SuSE-Code-11-SP2-Branch/storage/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/VERSION Mon May 30 14:02:55 2011 @@ -1 +1 @@ -2.17.103 +2.17.104 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 Mon May 30 14:02:55 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon May 30 14:01:57 CEST 2011 - fehr(a)suse.de + +- testsuite is BuildRequires not Requires +- version 2.17.104 + +------------------------------------------------------------------- Thu May 26 16:07:46 CEST 2011 - fehr(a)suse.de - backport patch to support also parted 2.4 Modified: branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in (original) +++ branches/SuSE-Code-11-SP2-Branch/storage/yast2-storage.spec.in Mon May 30 14:02:55 2011 @@ -3,9 +3,9 @@ @HEADER@ BuildRequires: blocxx-devel boost-devel gcc-c++ libxcrypt-devel openssl-devel sablot swig docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-testsuite yast2-perl-bindings libxml2-devel +BuildRequires: yast2-testsuite >= 2.17.0 Requires: yast2-storage-lib = %version yast2-perl-bindings mdadm lvm2 dmraid multipath-tools Requires: kpartx cryptsetup util-linux >= 2.16 lsscsi -Requires: yast2-testsuite >= 2.17.0 Requires: yast2-core >= 2.17.38 Requires: yast2 >= 2.17.94 Requires: yast2-libyui >= 2.17.5 -- 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] r64134 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 30 May '11

30 May '11

Author: coolo Date: Mon May 30 13:24:56 2011 New Revision: 64134 URL: http://svn.opensuse.org/viewcvs/yast?rev=64134&view=rev Log: lnussel: change write_hostname_to_hosts to false (fate#308824) Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 30 13:24:56 2011 @@ -16,7 +16,7 @@ <firewall_enable_ssh config:type="boolean">false</firewall_enable_ssh>  - <write_hostname_to_hosts config:type="boolean">true</write_hostname_to_hosts> + <write_hostname_to_hosts config:type="boolean">false</write_hostname_to_hosts>  <run_init_scripts_in_parallel config:type="boolean">true</run_init_scripts_in_parallel> -- 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] r64133 - /trunk/installation/control/control.openSUSE.xml
by coolo＠svn2.opensuse.org 30 May '11

30 May '11

Author: coolo Date: Mon May 30 13:22:47 2011 New Revision: 64133 URL: http://svn.opensuse.org/viewcvs/yast?rev=64133&view=rev Log: it's 12.1 now Modified: trunk/installation/control/control.openSUSE.xml Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.ope… ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon May 30 13:22:47 2011 @@ -198,9 +198,9 @@ <extra_urls config:type="list">  <extra_url> - <baseurl>http://download.opensuse.org/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/update/12.1/</baseurl> <alias>repo-update</alias> - <name>openSUSE-11.4-Update</name> + <name>openSUSE-12.1-Update</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -209,36 +209,36 @@  <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/oss/</baseurl> <alias>repo-oss</alias> - <name>openSUSE-11.4-Oss</name> + <name>openSUSE-12.1-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/distribution/11.4/repo/non-oss/</baseurl> + <baseurl>http://download.opensuse.org/distribution/12.1/repo/non-oss/</baseurl> <alias>repo-non-oss</alias> - <name>openSUSE-11.4-Non-Oss</name> + <name>openSUSE-12.1-Non-Oss</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">true</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/debug/distribution/12.1/repo/oss/</baseurl> <alias>repo-debug</alias> - <name>openSUSE-11.4-Debug</name> + <name>openSUSE-12.1-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> <priority config:type="integer">99</priority> </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/debug/update/11.4/</baseurl> + <baseurl>http://download.opensuse.org/debug/update/12.1/</baseurl> <alias>repo-debug-update</alias> - <name>openSUSE-11.4-Update-Debug</name> + <name>openSUSE-12.1-Update-Debug</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> @@ -246,9 +246,9 @@ </extra_url> <extra_url> - <baseurl>http://download.opensuse.org/source/distribution/11.4/repo/oss/</baseurl> + <baseurl>http://download.opensuse.org/source/distribution/12.1/repo/oss/</baseurl> <alias>repo-source</alias> - <name>openSUSE-11.4-Source</name> + <name>openSUSE-12.1-Source</name> <prod_dir>/</prod_dir> <enabled config:type="boolean">false</enabled> <autorefresh config:type="boolean">true</autorefresh> -- 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] r64132 - /trunk/fcoe-client/src/complex.ycp
by gs＠svn2.opensuse.org 30 May '11

30 May '11

Author: gs Date: Mon May 30 12:51:46 2011 New Revision: 64132 URL: http://svn.opensuse.org/viewcvs/yast?rev=64132&view=rev Log: check for /etc/sysconfig/network/ifcfg-<interface>, improve handling in installed system Modified: trunk/fcoe-client/src/complex.ycp Modified: trunk/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/fcoe-client/src/complex.ycp?rev=… ============================================================================== --- trunk/fcoe-client/src/complex.ycp (original) +++ trunk/fcoe-client/src/complex.ycp Mon May 30 12:51:46 2011 @@ -38,7 +38,7 @@ import "FcoeClient"; import "Service"; import "Stage"; - +import "FileUtils"; include "fcoe-client/helps.ycp"; include "fcoe-client/dialogs.ycp"; @@ -251,15 +251,20 @@ { map card = FcoeClient::GetCurrentNetworkCard(); string dev_name = card["dev_name"]:""; + string command = ""; map output = $[]; string vlan_interface = ""; string fcoe_vlan_interface = ""; map status_map = $[]; - + boolean create_ifcfg = false; + string ifcfg_file = ""; + if ( Stage::initial() ) // first stage - create and start FCoE VLAN interface - { + { + // headline of a popup: creating and starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Creating and starting FCoE on detected VLAN device"), + // question to the user: really create and start FCoE sformat( _("Do you really want to create a FCoE network interface for discovered FCoE VLAN interface on %1 and start the FCoE initiator?"), dev_name ) ); @@ -274,6 +279,7 @@ if ( output["exit"]:255 != 0 ) { + // text of an error popup Popup::Error( sformat( _("Cannot create and start FCoE on %1"), dev_name ) ); return nil; } @@ -286,27 +292,39 @@ } else // installed system - if VLAN already exists only start FCoE { + // headline of a popup: starting Fibre Channel over Ethernet boolean ret = Popup::YesNoHeadline( _("Starting FCoE on detected VLAN device"), + // question to the user: really start FCoE sformat( _("Do you really want to start FCoE initiator on discovered FCoE VLAN interface on %1?"), dev_name ) ); if ( ret == true ) { - // call 'ifup' for vlan interface - creates /proc/net/vlan/<vlan-interface> + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1\.%2", dev_name, card["vlan_interface"]:"" ); + // if /etc/sysconfig/network/ifcfg-<vlan-interface> already exists - command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); - y2milestone( "Executing command: %1", command ); - output = (map)SCR::Execute( .target.bash_output, command ); - y2milestone( "Output: %1", output ); + // call 'ifup' for the interface (creates /proc/net/vlan/<vlan-interface>) + if ( FileUtils::Exists( ifcfg_file ) ) + { + command = sformat( "ifup %1\.%2", dev_name, card["vlan_interface"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); - if ( output["exit"]:255 == 0 ) - { - // start FCoE - command = sformat( "fipvlan -s %1", dev_name ); + if ( output["exit"]:255 == 0 ) + { + // start FCoE + command = sformat( "fipvlan -s %1", dev_name ); + } + else + { + command = sformat( "fipvlan -c -s %1", dev_name ); // create and start FCoE + create_ifcfg = true; + } } else { - // create and start FCoE command = sformat( "fipvlan -c -s %1", dev_name ); + create_ifcfg = true; } y2milestone( "Executing command: %1", command ); @@ -314,6 +332,7 @@ y2milestone( "Output: %1", output ); if ( output["exit"]:255 != 0 ) { + // text of an error popup: command failed on the network interface Popup::Error( sformat( _("Command \"%1\" on %2 failed."), command, dev_name ) ); return nil; } @@ -340,11 +359,18 @@ y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); status_map = FcoeClient::GetFCoEStatus( fcoe_vlan_interface ); - // store command to be able to redo the creation of FCoE VLAN interface - // in case of abort - TODO: is this also OK if only 'fipvlan -s <interface>' is called? + // store command to be able to redo the creation of FCoE VLAN interface in case of abort + // TODO: is this also OK if only 'fipvlan -s <interface>' is called? FcoeClient::AddRedoCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); - card["modified"] = "yes"; - FcoeClient::SetModified( true ); + if ( create_ifcfg ) + { + string config = sformat( "BOOTPROTO=\"static\"\nSTARTMODE=\"onboot\" +ETHERDEVICE=\"%1\"\nUSERCONTROL=\"no\"\nINTERFACETYPE=\"vlan\"\n", dev_name ); + ifcfg_file = sformat( "/etc/sysconfig/network/ifcfg-%1", fcoe_vlan_interface ); + SCR::Write(.target.string, ifcfg_file, config); + y2milestone( "Writing config: %1 to %2", config, ifcfg_file ); + FcoeClient::AddRedoCommand( sformat( "rm %1", ifcfg_file ) ); + } } else { @@ -357,7 +383,9 @@ card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; card["dcb_required"] = status_map["DCB_REQUIRED"]:""; card["cfg_file"] = status_map["Filename"]:""; - + card["modified"] = "yes"; + FcoeClient::SetModified( true ); + FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); y2milestone( "Current network interfaces: %1", FcoeClient::GetNetworkCards() ); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0