YaST Commits September 2011

yast-commit@lists.opensuse.org

21 participants
701 discussions

[yast-commit] r66140 - /tags/stable-2_21_0/http-server/
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 11:13:17 2011 New Revision: 66140 URL: http://svn.opensuse.org/viewcvs/yast?rev=66140&view=rev Log: Created tag stable-2_21_0 for http-server Added: tags/stable-2_21_0/http-server/ - copied from r66139, trunk/http-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] r66139 - in /trunk/apparmor: package/yast2-apparmor.changes src/clients/AA_Report.ycp
by jsrain＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: jsrain Date: Thu Sep 29 11:13:09 2011 New Revision: 66139 URL: http://svn.opensuse.org/viewcvs/yast?rev=66139&view=rev Log: don't close the module after running a report (bnc#531512) Modified: trunk/apparmor/package/yast2-apparmor.changes trunk/apparmor/src/clients/AA_Report.ycp Modified: trunk/apparmor/package/yast2-apparmor.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/package/yast2-apparmor.… ============================================================================== --- trunk/apparmor/package/yast2-apparmor.changes (original) +++ trunk/apparmor/package/yast2-apparmor.changes Thu Sep 29 11:13:09 2011 @@ -1,11 +1,12 @@ ------------------------------------------------------------------- -Thu Sep 29 08:31:53 UTC 2011 - jsrain@site +Thu Sep 29 09:17:21 UTC 2011 - jsrain@site - fixed enabling/disabling apparmor - fixed setting notifications (and enabling aaeventsd as part of global switch only) - prevent profile generator from failing immediately - prevent window from disappearing when starting a module +- don't close the module after running a report (bnc#531512) ------------------------------------------------------------------- Thu Sep 22 12:42:09 UTC 2011 - jreidinger(a)suse.com Modified: trunk/apparmor/src/clients/AA_Report.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/apparmor/src/clients/AA_Report.y… ============================================================================== --- trunk/apparmor/src/clients/AA_Report.ycp (original) +++ trunk/apparmor/src/clients/AA_Report.ycp Thu Sep 29 11:13:09 2011 @@ -59,7 +59,7 @@ "runReport": $[ `back : `back, `abort : `abort, - `next : `finish, + `next : "schedReport", `finish : `ws_finish ], "configreport" : $[ -- 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] r66138 - /trunk/http-server/yast2-http-server.spec.in
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 11:10:10 2011 New Revision: 66138 URL: http://svn.opensuse.org/viewcvs/yast?rev=66138&view=rev Log: fix dependency Modified: trunk/http-server/yast2-http-server.spec.in Modified: trunk/http-server/yast2-http-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/yast2-http-server.sp… ============================================================================== --- trunk/http-server/yast2-http-server.spec.in (original) +++ trunk/http-server/yast2-http-server.spec.in Thu Sep 29 11:10:10 2011 @@ -6,7 +6,8 @@ BuildRequires: yast2-network docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite libzio Requires: yast2-network yast2-perl-bindings libzio # DnsServerApi moved to yast2.rpm (bnc#392606) -Requires: yast2 >= 2.16.73 +# Wizard::SetDesktopTitleAndIcon +Requires: yast2 >= 2.21.22 BuildArchitectures: noarch -- 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] r66137 - in /trunk/http-server: VERSION package/yast2-http-server.changes src/wizards.ycp
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 11:09:40 2011 New Revision: 66137 URL: http://svn.opensuse.org/viewcvs/yast?rev=66137&view=rev Log: use Wizard::SetDesktopTitleAndIcon Modified: trunk/http-server/VERSION trunk/http-server/package/yast2-http-server.changes trunk/http-server/src/wizards.ycp Modified: trunk/http-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/VERSION?rev=66137&r1… ============================================================================== --- trunk/http-server/VERSION (original) +++ trunk/http-server/VERSION Thu Sep 29 11:09:40 2011 @@ -1 +1 @@ -2.20.1 +2.21.0 Modified: trunk/http-server/package/yast2-http-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/package/yast2-http-s… ============================================================================== --- trunk/http-server/package/yast2-http-server.changes (original) +++ trunk/http-server/package/yast2-http-server.changes Thu Sep 29 11:09:40 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 29 11:08:59 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.0 + +------------------------------------------------------------------- Fri Aug 5 12:32:11 CEST 2011 - tgoettlicher(a)suse.de - fixed .desktop file (bnc #681249) Modified: trunk/http-server/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/http-server/src/wizards.ycp?rev=… ============================================================================== --- trunk/http-server/src/wizards.ycp (original) +++ trunk/http-server/src/wizards.ycp Thu Sep 29 11:09:40 2011 @@ -230,7 +230,7 @@ ]; Wizard::CreateDialog(); - Wizard::SetDesktopIcon("http-server"); + Wizard::SetDesktopTitleAndIcon("http-server"); boolean w_mode=HttpServer::isWizardMode(); if (w_mode) sequence["read", `next] = "wizard"; @@ -254,7 +254,7 @@ term contents = `Label(_("Initializing ...")); Wizard::CreateDialog(); - Wizard::SetDesktopIcon("http-server"); + Wizard::SetDesktopTitleAndIcon("http-server"); Wizard::SetContentsButtons(caption, contents, "", Label::BackButton(), Label::NextButton()); -- 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] r66136 - in /trunk/ca-management: package/yast2-ca-management.changes src/ca_mgm_auto.ycp src/ca_mgm_proposal.ycp src/crlExport.ycp
by mcalmer＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: mcalmer Date: Thu Sep 29 11:03:02 2011 New Revision: 66136 URL: http://svn.opensuse.org/viewcvs/yast?rev=66136&view=rev Log: quote pathes used in target.bash (bnc#266220) Modified: trunk/ca-management/package/yast2-ca-management.changes trunk/ca-management/src/ca_mgm_auto.ycp trunk/ca-management/src/ca_mgm_proposal.ycp trunk/ca-management/src/crlExport.ycp Modified: trunk/ca-management/package/yast2-ca-management.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/package/yast2-ca-m… ============================================================================== --- trunk/ca-management/package/yast2-ca-management.changes (original) +++ trunk/ca-management/package/yast2-ca-management.changes Thu Sep 29 11:03:02 2011 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 29 11:01:16 CEST 2011 - mc(a)suse.de + +- quote pathes used in target.bash (bnc#266220) + +------------------------------------------------------------------- Mon Sep 26 14:44:47 CEST 2011 - visnov(a)suse.cz - version 2.21.7 Modified: trunk/ca-management/src/ca_mgm_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_auto.yc… ============================================================================== --- trunk/ca-management/src/ca_mgm_auto.ycp (original) +++ trunk/ca-management/src/ca_mgm_auto.ycp Thu Sep 29 11:03:02 2011 @@ -48,13 +48,13 @@ list<string> name_list = maplist ( string k, string v, country_map, { return v; }); - name_list = sort (name_list); - + name_list = sort (name_list); + foreach (string name, name_list, ``{ result = add (result, `item (`id (country_index[name]:""), name , CaMgm::autoYaSTSettings["country"]:Timezone::GetCountryForTimezone("") == country_index[name]:"") ); }); - return result; + return result; } @@ -73,7 +73,7 @@ Here, change the settings of this CA and certificate or import a CA and certificate from a file. </p> "); - + /* Initialization dialog contents */ Wizard::CreateDialog(); @@ -86,7 +86,7 @@ _("Import Common CA and Certificate"), CaMgm::autoYaSTSettings["importCertificate"]:true)), `HBox ( `HSpacing (3), - `VBox( + `VBox( `HBox ( `HWeight(2, `TextEntry( `id (`pathCert), _("&Path of Certificate"), CaMgm::autoYaSTSettings["pathCertificate"]:"")), @@ -97,42 +97,42 @@ ) ), `HBox(`HWeight (1,`Password(`id(`pw3), `opt(`hstretch), _("&Password:"), CaMgm::autoYaSTSettings["password"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Password(`id(`pw4), `opt(`hstretch), _("Co&nfirm Password"), confirmPassword)) ) ) - ), + ), `Left(`RadioButton(`id(`notImport), `opt( `notify), _("Generate Common CA and Certificate"), !(CaMgm::autoYaSTSettings["importCertificate"]:false))), `HBox(`HSpacing (3), - `VBox( + `VBox( `HBox(`HWeight (1,`TextEntry( `id (`id_CAName), _("&CA Name:"), CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_commonName), _("&Common Name:"), CaMgm::autoYaSTSettings["ca_commonName"]:"")) ), `HBox(`HWeight (1,`TextEntry(`id(`email), _("E-Mail"), CaMgm::autoYaSTSettings["server_email"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`ComboBox( `id (`id_country), `opt(`editable), _("C&ountry:"), getAutoCountryList())) - ), + ), `HBox(`HWeight (1,`TextEntry( `id (`id_organisation), _("O&rganization:"), CaMgm::autoYaSTSettings["organisation"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_organisationUnit), _("Or&ganizational Unit:"), CaMgm::autoYaSTSettings["organisationUnit"]:"")) ), `HBox(`HWeight (1,`TextEntry( `id (`id_locality), _("Loca&lity:"), CaMgm::autoYaSTSettings["locality"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`TextEntry( `id (`id_state), _("&State:"), CaMgm::autoYaSTSettings["state"]:"")) ), `HBox(`HWeight (1,`Password(`id(`pw1), `opt(`hstretch), _("&Password:"), CaMgm::autoYaSTSettings["password"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Password(`id(`pw2), `opt(`hstretch), _("Co&nfirm Password"), confirmPassword)) ), `Left(`CheckBox(`id(`localServerName), `opt(`notify), @@ -140,7 +140,7 @@ CaMgm::autoYaSTSettings["takeLocalServerName"]:true)), `HBox(`HWeight (1,`TextEntry( `id (`id_serverName), _("&Server Name:"), CaMgm::autoYaSTSettings["server_commonName"]:"")), - `HSpacing(2), + `HSpacing(2), `HWeight (1,`Empty()) ) ) @@ -148,15 +148,15 @@ ) ) ); - + Wizard::SetContents (caption, contents, help_text, false, true); Wizard::SetNextButton(`next, Label::FinishButton() ); - + // Get the user input. // any ret = nil; - repeat + repeat { if (UI::QueryWidget(`id(`rb), `CurrentButton) == `import) { @@ -172,11 +172,11 @@ UI::ChangeWidget (`id (`pw2), `Enabled, false); UI::ChangeWidget (`id (`localServerName), `Enabled, false); UI::ChangeWidget (`id (`id_serverName), `Enabled, false); - UI::ChangeWidget (`id (`pathCert), `Enabled, true); + UI::ChangeWidget (`id (`pathCert), `Enabled, true); UI::ChangeWidget (`id(`browseCert), `Enabled, true); UI::ChangeWidget (`id (`pw3), `Enabled, true); UI::ChangeWidget (`id (`pw4), `Enabled, true); - + } else { @@ -189,11 +189,11 @@ UI::ChangeWidget (`id (`id_locality), `Enabled, true); UI::ChangeWidget (`id (`id_state), `Enabled, true); UI::ChangeWidget (`id (`localServerName), `Enabled, true); - UI::ChangeWidget (`id (`pathCert), `Enabled, false); + UI::ChangeWidget (`id (`pathCert), `Enabled, false); UI::ChangeWidget (`id(`browseCert), `Enabled, false); UI::ChangeWidget (`id (`pw3), `Enabled, false); UI::ChangeWidget (`id (`pw4), `Enabled, false); - + UI::ChangeWidget (`id (`pw1), `Enabled, true); UI::ChangeWidget (`id (`pw2), `Enabled, true); @@ -204,10 +204,10 @@ else { UI::ChangeWidget (`id (`id_serverName), `Enabled, true); - } + } } - + ret = Wizard::UserInput(); if (ret == `browseCert) @@ -217,14 +217,14 @@ { UI::ChangeWidget(`id(`pathCert), `Value, name); } - ret = `again; + ret = `again; } if (ret == `next ||ret == `back) { remove (CaMgm::autoYaSTSettings, "certificate"); - + boolean notImport = (boolean) (UI::QueryWidget(`id(`rb), `CurrentButton) == `notImport); if (notImport) { @@ -246,7 +246,7 @@ { Popup::Error(_("CA name required.")); ret = `again; - } + } if (notImport && size ((string) UI::QueryWidget(`id(`id_commonName), `Value)) <= 0 && ret!=`again) @@ -268,7 +268,7 @@ && ret!=`again) { Popup::Error(_("Server name required.")); - ret = `again; + ret = `again; } if (!notImport @@ -284,42 +284,42 @@ { Popup::Error(_("Password length should be greater than three characters.")); ret = `again; - } - } + } + } map retmap = $[]; - + if (!notImport && ret!=`again) { string command = sformat("/usr/bin/openssl base64 -in %1 -e", - (string) UI::QueryWidget(`id (`pathCert), `Value)); + String::Quote ( (string) UI::QueryWidget(`id (`pathCert), `Value))); retmap = (map) SCR::Execute (.target.bash_output, command, $[] ); y2milestone("%1 :%2", command, retmap); if (retmap["exit"]:0 != 0) { - y2error("%1 :%2", command, retmap); + y2error("%1 :%2", command, retmap); Popup::Error(_("Cannot read the certificate.")); - ret = `again; + ret = `again; } } if (ret!=`again) { CaMgm::autoYaSTSettings = $[]; - + CaMgm::autoYaSTSettings["importCertificate"] = (boolean) ((symbol)UI::QueryWidget(`id(`rb), `CurrentButton) == `import); if (CaMgm::autoYaSTSettings["importCertificate"]:false) { CaMgm::autoYaSTSettings["certificate"] = strip(retmap["stdout"]:""); CaMgm::autoYaSTSettings["pathCertificate"] = (string) UI::QueryWidget(`id (`pathCert), `Value); - CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw3), `Value); + CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw3), `Value); } else { - CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean) UI::QueryWidget(`id(`localServerName), `Value); + CaMgm::autoYaSTSettings["takeLocalServerName"] = (boolean) UI::QueryWidget(`id(`localServerName), `Value); CaMgm::autoYaSTSettings["password"] = (string) UI::QueryWidget(`id(`pw1), `Value); if (!CaMgm::autoYaSTSettings["takeLocalServerName"]:true) { @@ -363,7 +363,7 @@ // importing CA/certificate CaMgm::autoYaSTSettings["certificate"] = settings["certificate"]:""; CaMgm::autoYaSTSettings["pathCertificate"] = settings["pathCertificate"]:""; - CaMgm::autoYaSTSettings["password"] = settings["password"]:""; + CaMgm::autoYaSTSettings["password"] = settings["password"]:""; } else { @@ -372,20 +372,20 @@ { CaMgm::autoYaSTSettings["password"] = settings["password"]:""; } - + CaMgm::autoYaSTSettings["takeLocalServerName"] = settings["takeLocalServerName"]:true; if (settings["takeLocalServerName"]:true ) { map<string,string> host_ips = getHostIPs (); string hostname_bak = ""; - + foreach(string key, string value, host_ips, { if(value == "DNS") { hostname_bak = key; } }); - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -406,44 +406,44 @@ else { if (haskey (settings, "server_commonName")) - { + { CaMgm::autoYaSTSettings["server_commonName"] = settings["server_commonName"]:""; } } if (haskey (settings, "CAName")) - { + { CaMgm::autoYaSTSettings["CAName"] = settings["CAName"]:"YaST_Default_CA"; } if (haskey (settings, "ca_commonName")) - { + { CaMgm::autoYaSTSettings["ca_commonName"] = settings["ca_commonName"]:""; } if (haskey (settings, "server_email")) - { + { CaMgm::autoYaSTSettings["server_email"] = settings["server_email"]:""; } if (haskey (settings, "country")) - { + { CaMgm::autoYaSTSettings["country"] = settings["country"]:""; } if (haskey (settings, "organisation")) - { + { CaMgm::autoYaSTSettings["organisation"] = settings["organisation"]:""; } if (haskey (settings, "organisationUnit")) - { + { CaMgm::autoYaSTSettings["organisationUnit"] = settings["organisationUnit"]:""; } if (haskey (settings, "locality")) - { + { CaMgm::autoYaSTSettings["locality"] = settings["locality"]:""; } if (haskey (settings, "state")) - { + { CaMgm::autoYaSTSettings["state"] = settings["state"]:""; } } - + return ret; } @@ -453,7 +453,7 @@ * @return map Dumped settings (later acceptable by Import ()) */ map Export () { - + return CaMgm::autoYaSTSettings; } @@ -477,7 +477,7 @@ if (CaMgm::autoYaSTSettings["importCertificate"]:false) { - summary = Summary::AddHeader (summary,_("Import Certificate from File")); + summary = Summary::AddHeader (summary,_("Import Certificate from File")); summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["pathCertificate"]:""); } else @@ -507,7 +507,7 @@ summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["locality"]:_("[not set]")); summary = Summary::AddHeader (summary, _("State")); summary = Summary::AddLine (summary, CaMgm::autoYaSTSettings["state"]:_("[not set]")); - + summary = Summary::AddHeader (summary, _("Password")); if (size (CaMgm::autoYaSTSettings["password"]:"") <= 0 ) { @@ -518,7 +518,7 @@ summary = Summary::AddLine (summary, _("[set]")); } } - + return summary; } @@ -535,7 +535,7 @@ Report::DisplayErrors(true, 5); Report::DisplayMessages(true, 5); - + // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/2 */ @@ -556,13 +556,13 @@ // Read server information string tmpfile = (string) SCR::Read (.target.tmpdir) + "/YaST-Servercert.p12"; - + Progress::NextStage(); if (CaMgm::autoYaSTSettings["importCertificate"]:false) { // importing CA/certificate string command = sformat("/usr/bin/openssl base64 -out %1 -d", - tmpfile); + String::Quote ( tmpfile )); SCR::Execute (.target.bash_input, command, CaMgm::autoYaSTSettings["certificate"]:""); @@ -574,14 +574,14 @@ { map<string,string> host_ips = getHostIPs (); string hostname_bak = ""; - + foreach(string key, string value, host_ips, { if(value == "DNS") { hostname_bak = key; } }); - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -604,7 +604,7 @@ { CaMgm::prop_server_commonName = CaMgm::autoYaSTSettings["server_commonName"]:""; } - + CaMgm::prop_selection = `def; CaMgm::prop_ca_commonName = CaMgm::autoYaSTSettings["ca_commonName"]:""; CaMgm::prop_CAName = CaMgm::autoYaSTSettings["CAName"]:"YaST_Default_CA"; @@ -618,7 +618,7 @@ } Progress::NextStage(); - + // write settings if (success) @@ -635,18 +635,18 @@ || !importret) { success = false; - } + } } else { - success = create_default_CA_certificate(); + success = create_default_CA_certificate(); } } if (!success) { /* Error message */ Report::Error (_("Cannot create certificates.")); - } + } sleep(sl); @@ -690,14 +690,14 @@ { domain = strip(retmap["stdout"]:"site"); } - + if(found) { map serverCertDN = servercert["DN_HASH"]:$[]; map serverCertIssuer = servercert["ISSUER_HASH"]:$[]; - - CaMgm::autoYaSTSettings["takeLocalServerName"] = false; + + CaMgm::autoYaSTSettings["takeLocalServerName"] = false; CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; CaMgm::autoYaSTSettings["server_commonName"] = ((list)serverCertDN["CN"]:[])[0]:(hostname + "." + domain); CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; @@ -711,7 +711,7 @@ } else { - CaMgm::autoYaSTSettings["takeLocalServerName"] = true; + CaMgm::autoYaSTSettings["takeLocalServerName"] = true; CaMgm::autoYaSTSettings["password"] = "ENTER PASSWORD HERE"; CaMgm::autoYaSTSettings["CAName"] = "YaST_Default_CA"; CaMgm::autoYaSTSettings["ca_commonName"] = "YaST Default CA " + "(" + domain + ")"; Modified: trunk/ca-management/src/ca_mgm_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/ca_mgm_proposa… ============================================================================== --- trunk/ca-management/src/ca_mgm_proposal.ycp (original) +++ trunk/ca-management/src/ca_mgm_proposal.ycp Thu Sep 29 11:03:02 2011 @@ -56,7 +56,7 @@ string hostname_bak = ""; if (size(CaMgm::prop_subject_alt_name_list) <= 0){ CaMgm::prop_subject_alt_name_list = []; - + foreach(string key, string value, host_ips, { if(value == "DNS") { @@ -68,7 +68,7 @@ CaMgm::prop_subject_alt_name_list = add (CaMgm::prop_subject_alt_name_list, elem); }); } - + map retmap = (map) SCR::Execute (.target.bash_output, "/bin/hostname --long", $[] ); @@ -94,7 +94,7 @@ retmap["stdout"] = hostname_bak; } } - + string longhostname = strip(retmap["stdout"]:""); if ( longhostname == nil ) longhostname = ""; // (bnc#428101) @@ -106,12 +106,12 @@ if ( hostname == nil ) hostname = ""; // (bnc#428101) string domain = substring (longhostname, findfirstof(longhostname,".")+1); if ( domain == nil ) domain = ""; // (bnc#428101) - + if (size (domain) <= 0) { domain = longhostname; } - + if (!CaMgm::prop_ca_commonNameChanged) { CaMgm::prop_ca_commonName = "YaST Default CA (" + hostname + ")"; @@ -128,12 +128,12 @@ { CaMgm::prop_email = "postmaster@" + domain; } - + if(ret["warning"]:"" != "") { return ret; } - + // new handling of force reset because of (#238754) if (force_reset) @@ -185,8 +185,8 @@ "inForm":"PEM" ]); CaMgm::prop_settingsWritten = defaultRootCA != nil ? true:false; - - + + if (CaMgm::prop_settingsWritten) { if( CaMgm::prop_keep_ca || !Popup::YesNo(_("CA Management") + "\n" + @@ -200,7 +200,7 @@ "type":"parsed", "datatype":"CERTIFICATE", "inForm":"PEM" ]); - + map defaultServerCertIssuer = defaultServerCert["ISSUER_HASH"]:$[]; // CaMgm::prop_selection = `def; CaMgm::prop_ca_commonName = ((list)defaultServerCertIssuer["CN"]:[])[0]:""; @@ -209,9 +209,9 @@ CaMgm::prop_CAName = CaMgm::prop_CAName; map defaultSCmap = defaultServerCert["DN_HASH"]:$[]; - + CaMgm::prop_server_commonName = ((list)defaultSCmap["CN"]:[])[0]:""; - + ret = $[ "workflow_sequence" : `auto ]; } @@ -276,7 +276,7 @@ } if ( size(pw1) < 4) { - Popup::Error(_("The password is too short for use as the password for the certificates. + Popup::Error(_("The password is too short for use as the password for the certificates. Enter a valid password for the certificates or disable certificate creation. ")); continue; @@ -292,7 +292,7 @@ break; } } - + UI::CloseDialog (); } if (CaMgm::prop_keep_ca) @@ -311,14 +311,14 @@ proposal = HTML::Para(_("Creating default CA and certificate.") + HTML::Newline()); } - + string passwordString = (string) (CaMgm::prop_passwordChanged ? _("[manually set]") : _("[root password]")); string subAltName = ""; foreach(map elem, CaMgm::prop_subject_alt_name_list, { subAltName = subAltName + elem["kind"]:"" + ":" + elem["name"]:"" + " "; }); - + proposal = proposal+ HTML::List( [ _("CA Name: ") + CaMgm::prop_CAName, _("Common Name: ") + CaMgm::prop_ca_commonName, _("Server Name: ") + CaMgm::prop_server_commonName, @@ -327,10 +327,10 @@ _("E-Mail: ") + CaMgm::prop_email, _("Alternative Names: ") + subAltName, ] ); - + if ( !CaMgm::prop_keep_ca && size(CaMgm::prop_password) < 4) { - ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. + ret = add( ret, "warning", _("The root password is too short for use as the password for the certificates. Enter a valid password for the certificates or disable certificate creation. ")); ret = add( ret, "warning_level", `blocker ); @@ -344,7 +344,7 @@ { proposal = HTML::Para(_("Importing a CA and certificate from file")); } - + ret = add (ret, "preformatted_proposal", proposal); if ( ((list<string>) splitstring (CaMgm::prop_server_commonName, "."))[0]:"" == "linux") { @@ -398,7 +398,7 @@ else if (func == "Write") { boolean success = true; - + if (!CaMgm::prop_settingsWritten) { if (CaMgm::prop_selection == `def) @@ -414,7 +414,7 @@ CaMgm::prop_settingsWritten = true; } } - + ret = $[ "success" : success ]; } return ret; Modified: trunk/ca-management/src/crlExport.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ca-management/src/crlExport.ycp?… ============================================================================== --- trunk/ca-management/src/crlExport.ycp (original) +++ trunk/ca-management/src/crlExport.ycp Thu Sep 29 11:03:02 2011 @@ -60,7 +60,7 @@ define void showSecurityInfo() { Popup::LongText( - // Translators: window caption + // Translators: window caption _("Security Information"), // Translators: long help text - security information `RichText(_("Warning!<br>Activating the automatic creation and export of a CRL will write the CA password to a configuration file on disk. The password will be stored there in plain text as it is needed to create a CRL. The file will only be readable for the root user.")), @@ -120,7 +120,7 @@ define void readSettings(string ca) { string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " ")); - if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0 ) + if (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote (crlConf) ) ) == 0 ) { SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini( `IniAgent( crlConf, crlConfFormat )) ); @@ -160,9 +160,9 @@ define void writeSettings(string ca) { string crlConf = sformat("/var/lib/CAM/%1/exportcrl.conf", deletechars(ca, " ")); - if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", crlConf) ) == 0)) + if (! (SCR::Execute(.target.bash, sformat("[ -f %1 ]", String::Quote (crlConf)) ) == 0)) { - SCR::Execute(.target.bash, sformat("umask 0077 && touch %1", crlConf) ); + SCR::Execute(.target.bash, sformat("umask 0077 && touch %1", String::Quote (crlConf)) ); } SCR::RegisterAgent( .temp_crlexport_agent, `ag_ini( @@ -240,7 +240,7 @@ `VBox(`VSpacing(1), `PushButton(`id(`askFile), Label::BrowseButton() )) ), `Left( `RadioButtonGroup(`id(`fileformat), - `HBox( + `HBox( `Label(_("Export Format")), `RadioButton(`id(`ffpem), `opt(`notify), _("PEM Format"), true ), `RadioButton(`id(`ffder), `opt(`notify), _("DER Format") ) @@ -276,7 +276,7 @@ `Left( `CheckBox(`id(`exportFile), `opt(`notify), _("Export to file"), true )), `HBox( `HSpacing(hspace), cfilesettings ), `VSpacing(vspace), - `Left( `CheckBox(`id(`exportLDAP), `opt(`notify), _("Export to LDAP"), false )), + `Left( `CheckBox(`id(`exportLDAP), `opt(`notify), _("Export to LDAP"), false )), `HBox( `HSpacing(hspace), cldapsettings ), `VSpacing(vspace), cinterval @@ -308,7 +308,7 @@ if (ui == `askFile) { string fformat = "*.pem"; - if (fileformat == `ffder) fformat = "*.der"; + if (fileformat == `ffder) fformat = "*.der"; string newcrlfile = UI::AskForSaveFileName( crlfile, fformat, _("Save as") ); if (newcrlfile != nil && newcrlfile != "") crlfile = newcrlfile; } -- 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] r66135 - /tags/stable-2_21_0/heartbeat/
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 10:52:35 2011 New Revision: 66135 URL: http://svn.opensuse.org/viewcvs/yast?rev=66135&view=rev Log: Created tag stable-2_21_0 for heartbeat Added: tags/stable-2_21_0/heartbeat/ - copied from r66134, trunk/heartbeat/ -- 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] r66134 - in /trunk/heartbeat: VERSION package/yast2-heartbeat.changes src/wizards.ycp yast2-heartbeat.spec.in
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 10:52:27 2011 New Revision: 66134 URL: http://svn.opensuse.org/viewcvs/yast?rev=66134&view=rev Log: -use Wizard::SetDesktopTitleAndIcon Modified: trunk/heartbeat/VERSION trunk/heartbeat/package/yast2-heartbeat.changes trunk/heartbeat/src/wizards.ycp trunk/heartbeat/yast2-heartbeat.spec.in Modified: trunk/heartbeat/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/VERSION?rev=66134&r1=6… ============================================================================== --- trunk/heartbeat/VERSION (original) +++ trunk/heartbeat/VERSION Thu Sep 29 10:52:27 2011 @@ -1 +1 @@ -2.17.1 +2.21.0 Modified: trunk/heartbeat/package/yast2-heartbeat.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/package/yast2-heartbea… ============================================================================== --- trunk/heartbeat/package/yast2-heartbeat.changes (original) +++ trunk/heartbeat/package/yast2-heartbeat.changes Thu Sep 29 10:52:27 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 29 10:51:55 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.0 + +------------------------------------------------------------------- Fri Aug 5 12:32:09 CEST 2011 - tgoettlicher(a)suse.de - fixed .desktop file (bnc #681249) Modified: trunk/heartbeat/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/src/wizards.ycp?rev=66… ============================================================================== --- trunk/heartbeat/src/wizards.ycp (original) +++ trunk/heartbeat/src/wizards.ycp Thu Sep 29 10:52:27 2011 @@ -46,6 +46,7 @@ ); Wizard::CreateTree(tree, ""); + Wizard::SetDesktopTitleAndIcon ("heartbeat"); // Buttons redefinition @@ -126,6 +127,7 @@ ]; Wizard::CreateDialog(); + Wizard::SetDesktopTitleAndIcon ("heartbeat"); any ret = Sequencer::Run(aliases, sequence); Modified: trunk/heartbeat/yast2-heartbeat.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/heartbeat/yast2-heartbeat.spec.i… ============================================================================== --- trunk/heartbeat/yast2-heartbeat.spec.in (original) +++ trunk/heartbeat/yast2-heartbeat.spec.in Thu Sep 29 10:52:27 2011 @@ -4,7 +4,7 @@ Group: System/YaST License: GPL v2 or later BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 +Requires: yast2 >= 2.21.22 BuildArchitectures: noarch -- 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] r66133 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client: agents/fcoe_cfg-ethx.scr src/FcoeClient.ycp src/complex.ycp src/fcoe-client_auto.ycp
by gs＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: gs Date: Thu Sep 29 10:50:21 2011 New Revision: 66133 URL: http://svn.opensuse.org/viewcvs/yast?rev=66133&view=rev Log: use ini agent for reading/writing /etc/fcoe/cfg-ethx files Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp Added: branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr (added) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/agents/fcoe_cfg-ethx.scr Thu Sep 29 10:50:21 2011 @@ -0,0 +1,39 @@ +/** + * File: fcoe_cfg-ethx.scr + * Summary: Agent for /etc/fcoe/cfg-* + * Access: read / write + * See: sysconfig.rpm + * + * General syntax: + * # comment0 + * VAR1=val1 # comment1 + * VAR2="val 2 #blah" # comment2 + * VAR3='val3 x #blah2' # comment3 + * + * + * <p>Reads/writes <tt>/etc/fcoe/cfg-*</tt>. + */ +.fcoe.cfg-ethx + +`ag_ini( + `IniAgent( [ "/etc/fcoe/cfg-*" ], + $[ + /* values at the top level, allow comments after value */ + "options" : [ "global_values", "comments_last" ], + /* empty lines, comments after value and whole-line comments */ + "comments" : [ "^[ \t]*$", "[ \t]*#.*$", "^[ \t]*#.*$" ], + /* matching rules */ + "params" : [ + /* VAR1="val1 'bal x" */ + $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=\"([^\"`\\$]*)\"", "%s='%s'" ] ], + /* VAR1='val1 xxx" xx' */ + $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)='([^']*)'", "%s='%s'" ] ], + /* VAR1=val1 */ + $[ "match" : [ "^[ \t]*([a-zA-Z_][a-zA-Z0-9_]*)=([^ \t\"$`'\\#]*)", "%s='%s'" ] ], + ], + /* matching rules */ + "rewrite" : [ + [ "/etc/fcoe/cfg-(.*)", "/etc/fcoe/cfg-%s" ], + ], + ] +)) Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/FcoeClient.ycp Thu Sep 29 10:50:21 2011 @@ -45,6 +45,7 @@ import "Service"; import "NetworkService"; import "String"; +import "FileUtils"; /** * Prototypes @@ -359,12 +360,12 @@ // if AUTO_VLAN is set to "yes" if ( netcard["auto_vlan"]:"no" == "yes" ) { - // set file name to cfg-<interface>, e.g. /etc/fcoe/eth3 + // set file name to cfg-<interface>, e.g. /etc/fcoe/cfg-eth3 file_name = sformat( "/etc/fcoe/cfg-%1", netcard["dev_name"]:"" ); } else { - // set file name to cfg-<vlan_device_name>, e.g. /etc/fcoe/eth3.200 + // set file name to cfg-<vlan_device_name>, e.g. /etc/fcoe/cfg-eth3.200 file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); } @@ -418,14 +419,15 @@ // // Get status of FCoE config from /etc/fcoe/cfg-<if>.<vlan> or /etc/fcoe/cfg-<if> // -global map <string, string> GetFcoeStatus( string vlan_device_name, map netcard ) +global map <string, string> GetFcoeStatus( string vlan_device_name, string device_name ) { map <string, string> status_map = $[]; string content = ""; boolean file_exists = false; string file_name = ""; + string device = vlan_device_name; - if ( vlan_device_name == "" ) + if ( vlan_device_name == "" || device_name == "" ) { y2error( "Interface not valid" ); return $[]; @@ -434,42 +436,36 @@ y2milestone( "VLAN channel %1 found", vlan_device_name ); file_name = sformat( "/etc/fcoe/cfg-%1", vlan_device_name ); - y2milestone( "Reading %1", file_name ); - content = (string)SCR::Read(.target.string, file_name); - if ( content == "" || content == nil ) + if ( !FileUtils::Exists( file_name ) ) { - // try to read /etc/fcoe/cfg-<interface> (interface was automatically created) - file_name = sformat( "/etc/fcoe/cfg-%1", netcard["dev_name"]:"" ); - y2milestone( "Reading %1", file_name ); - content = (string)SCR::Read(.target.string, file_name); + file_name = sformat( "/etc/fcoe/cfg-%1", device_name ); + + if ( !FileUtils::Exists( file_name ) ) + { + y2warning( "Cannot read config file for %1 in /etc/fcoe", vlan_device_name ); + Popup::Warning( sformat(_("Cannot read config file for %1"), vlan_device_name) ); + return status_map; + } + device = device_name; } + // for debugging purpose, read only needed values later + list values = SCR::Dir( .fcoe.cfg-ethx.value + device ); + y2milestone( "Available values in %1: %2", file_name, values ); + + foreach( string var, ["FCOE_ENABLE", "DCB_REQUIRED", "AUTO_VLAN"], { + string value = (string)SCR::Read(.fcoe.cfg-ethx.value + device + var); + if ( value == nil ) + { + y2warning( "Cannot read %1", var ); + continue; + } + status_map = add( status_map, var, value ); + }); - // foreach( string var, values, { - // SCR::Read(.fcoe.cfg-ethx.value + vlan_device_name + var); - // }); - if ( content != "" ) - { - list <string> lines = splitstring( content, "\n" ); - foreach( string line, (list<string>)lines, { - line = deletechars( line, " \t" ); - foreach( string var, ["FCOE_ENABLE", "DCB_REQUIRED", "AUTO_VLAN"], { - if ( String::StartsWith(line, var) ) - { - status_map = add( status_map, var, - deletechars( substring(line, size(var) + 1), "\"") ); - } - }); + status_map = add( status_map, "cfg_device", device ); - }); - status_map = add( status_map, "Filename", file_name ); - y2milestone( "Returning: %1", status_map ); - } - else - { - y2warning( "Cannot read /etc/fcoe/%1", file_name ); - Popup::Warning( sformat(_("Cannot read /etc/fcoe/cfg-file for %1"), vlan_device_name) ); - } + y2milestone( "Returning: %1", status_map ); return status_map; } @@ -616,7 +612,7 @@ // // dev_name device fcoe_vlan fcoe_enable dcb_required auto_vlan dcb_capable vlan_interface cfg_file -// eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no yes/no 200 /etc/fcoe/cfg-eth3.200 +// eth3 Ethernet card ... eth3.200 yes/no yes/no yes/no yes/no 200 eth3.200 // // Detect network interface cards (hardware probe) and get status // @@ -672,7 +668,7 @@ if ( fcoe_vlan_interface != "" ) { - status_map = GetFcoeStatus( fcoe_vlan_interface, card ); + status_map = GetFcoeStatus( fcoe_vlan_interface, card["dev_name"]:"" ); } else { @@ -706,7 +702,7 @@ } info_map = add( info_map, "dcb_capable", dcb_capable ); // DCB capable info_map = add( info_map, "vlan_interface", vlan_interface ); // VLAN interface, e.g. 200 - info_map = add( info_map, "cfg_file", status_map["Filename"]:"" ); // cfg file name, e.g. /etc/fcoe/cfg-eth3.200 + info_map = add( info_map, "cfg_file", status_map["cfg_device"]:"" ); // part of cfg-file name, e.g. eth3.200 network_interfaces = add( network_interfaces, info_map ); } ); @@ -744,20 +740,18 @@ // global boolean WriteFcoeConfig() { - boolean ret = true; - boolean success = (boolean)SCR::Write(add(.fcoe.config, "DEBUG"), GetFcoeConfig()["DEBUG"]:"" ); if ( !success ) - ret = false; + return false; success = (boolean)SCR::Write(add(.fcoe.config, "USE_SYSLOG"), GetFcoeConfig()["USE_SYSLOG"]:"" ); if ( !success ) - ret = false; + return false; // This is very important- it flushes the cache, and stores the configuration on the disk SCR::Write(.fcoe.config, nil); - return ret; + return true; } // @@ -766,7 +760,7 @@ global boolean WriteCfgFiles() { list <map> netcards = GetNetworkCards(); - boolean success = true; + boolean success = false; string command = ""; map output = $[]; @@ -776,46 +770,38 @@ if ( card["fcoe_vlan"]:"" != FcoeClient::NOT_AVAILABLE && // FCoE VLAN is configured card["fcoe_vlan"]:"" != FcoeClient::NOT_CONFIGURED && Modified() ) // and data are modified { - string content = (string)SCR::Read( .target.string, card["cfg_file"]:"" ); - y2debug( "Original content of %1: %2", card["cfg_file"]:"", content ); - - list <string> lines = (list<string>)splitstring( content, "\n" ); - lines = maplist( string line, lines, { - if ( !String::StartsWith( line, "#" ) ) line = deletechars( line, " \t" ); - - if ( String::StartsWith( line, "FCOE_ENABLE" ) ) - { - return sformat( "FCOE_ENABLE=\"%1\"", card["fcoe_enable"]:"no" ); - } - else if ( String::StartsWith( line, "DCB_REQUIRED" ) ) - { - return sformat( "DCB_REQUIRED=\"%1\"", card["dcb_required"]:"no" ); - } - else if ( String::StartsWith( line, "AUTO_VLAN" ) ) - { - return sformat( "AUTO_VLAN=\"%1\"", card["auto_vlan"]:"no" ); - } - else - { - return line; - } - }); - content = mergestring( lines, "\n" ); - y2milestone( "Writing content: %1", content ); - - boolean ret = SCR::Write( .target.string, card["cfg_file"]:"", content ); - if ( !ret ) + y2milestone( "Write .fcoe.cfg-ethx.value.cfg-%1.<var>", card["cfg_file"]:"" ); + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "FCOE_ENABLE", card[ "fcoe_enable"]:"no" ); + if ( !success ) { - success = ret; - y2error( "Cannot write %1", card["cfg_file"]:"" ); + y2error( "Writing FCOE_ENABLE=%1 failed", card[ "fcoe_enable"]:"no" ); + return false; } - else + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "DCB_REQUIRED", card["dcb_required"]:"no" ); + if ( !success ) + { + y2error( "Writing DCB_REQUIRED=%1 failed", card["dcb_required"]:"no" ); + return false; + } + success = SCR::Write(.fcoe.cfg-ethx.value + card["cfg_file"]:"" + "AUTO_VLAN", card["auto_vlan"]:"no" ); + if ( !success ) { - y2milestone( "%1 written", card["cfg_file"]:"" ); + y2error( "Writing AUTO_VLAN=%1 failed", card["auto_vlan"]:"no" ); + return false; } - // enable DCB app fcoe (app:0) if ( card["dcb_required"]:"no" == "yes" ) { + //enable DCB on the interface + command = sformat( "dcbtool sc %1 dcb on", card["dev_name"]:"" ); + y2milestone( "Executing command: %1", command ); + output = (map)SCR::Execute( .target.bash_output, command ); + y2milestone( "Output: %1", output ); + if ( output["exit"]:255 != 0 ) + { + Popup::Error( sformat( _("Command: %1 failed"), command ) ); + y2error( "Command: %1 failed", command); + } + // enable App:FCoE on the interface command = sformat( "dcbtool sc %1 app:0 e:1 a:1 w:1", card["dev_name"]:"" ); y2milestone( "Executing command: %1", command ); @@ -829,8 +815,10 @@ } } } ); + // This is very important- it flushes the cache, and stores the configuration on the disk + SCR::Write( .fcoe.cfg-ethx, nil ); - return success; + return true; } global boolean RestartServiceFcoe() Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Thu Sep 29 10:50:21 2011 @@ -382,7 +382,7 @@ { y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); - status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card ); + status_map = FcoeClient::GetFcoeStatus ( fcoe_vlan_interface, card["dev_name"]:"" ); // store command to be able to revert the creation of FCoE VLAN interface in case of 'Abort' // (also if only 'fipvlan -s <interface>' is called) FcoeClient::AddRevertCommand( sformat("vconfig rem %1", fcoe_vlan_interface ) ); @@ -407,7 +407,7 @@ card["fcoe_enable"] = status_map["FCOE_ENABLE"]:""; card["dcb_required"] = status_map["DCB_REQUIRED"]:""; card["auto_vlan"] = status_map["AUTO_VLAN"]:""; - card["cfg_file"] = status_map["Filename"]:""; + card["cfg_file"] = status_map["cfg_device"]:""; FcoeClient::SetModified( true ); FcoeClient::SetNetworkCardsValue( FcoeClient::current_card, card ); @@ -450,7 +450,7 @@ if ( output["exit"]:255 == 0 ) { - command = sformat( "rm %1", card["cfg_file"]:"" ); + command = sformat( "rm /etc/fcoe/cfg-%1", card["cfg_file"]:"" ); y2milestone( "Calling %1", command ); output = (map)SCR::Execute( .target.bash_output, command ); y2milestone( "Output: %1", output ); Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/fcoe-client_auto.ycp Thu Sep 29 10:50:21 2011 @@ -205,7 +205,7 @@ y2milestone( "FCoE VLAN interface %1 created/started", fcoe_vlan_interface ); // create /etc/fcoe/ethx file and get values FcoeClient::CreateFcoeConfig( fcoe_vlan_interface, card ); - status_map = FcoeClient::GetFcoeStatus( fcoe_vlan_interface, card ); + status_map = FcoeClient::GetFcoeStatus( fcoe_vlan_interface, card["dev_name"]:"" ); // apply modified data detected_netcards[ index, "fcoe_vlan"] = fcoe_vlan_interface; detected_netcards[ index, "cfg_file"] = status_map["Filename"]:""; -- 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] r66132 - /tags/stable-2_21_1/irda/
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 10:48:13 2011 New Revision: 66132 URL: http://svn.opensuse.org/viewcvs/yast?rev=66132&view=rev Log: Created tag stable-2_21_1 for irda Added: tags/stable-2_21_1/irda/ - copied from r66131, trunk/irda/ -- 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] r66131 - in /trunk/irda: VERSION package/yast2-irda.changes src/ui.ycp yast2-irda.spec.in
by visnov＠svn2.opensuse.org 29 Sep '11

29 Sep '11

Author: visnov Date: Thu Sep 29 10:48:06 2011 New Revision: 66131 URL: http://svn.opensuse.org/viewcvs/yast?rev=66131&view=rev Log: use Wizard::SetDesktopTitleAndIcon Modified: trunk/irda/VERSION trunk/irda/package/yast2-irda.changes trunk/irda/src/ui.ycp trunk/irda/yast2-irda.spec.in Modified: trunk/irda/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/VERSION?rev=66131&r1=66130&… ============================================================================== --- trunk/irda/VERSION (original) +++ trunk/irda/VERSION Thu Sep 29 10:48:06 2011 @@ -1 +1 @@ -2.21.0 +2.21.1 Modified: trunk/irda/package/yast2-irda.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/package/yast2-irda.changes?… ============================================================================== --- trunk/irda/package/yast2-irda.changes (original) +++ trunk/irda/package/yast2-irda.changes Thu Sep 29 10:48:06 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Sep 29 10:47:05 CEST 2011 - visnov(a)suse.cz + +- set dialog title +- 2.21.1 + +------------------------------------------------------------------- Mon Sep 12 13:26:23 UTC 2011 - lslezak(a)suse.cz - updated testsuite (systemd support) (bnc#664548) Modified: trunk/irda/src/ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/src/ui.ycp?rev=66131&r1=661… ============================================================================== --- trunk/irda/src/ui.ycp (original) +++ trunk/irda/src/ui.ycp Thu Sep 29 10:48:06 2011 @@ -333,7 +333,7 @@ define symbol IrDASequence () { Wizard::OpenOKDialog (); - Wizard::SetDesktopIcon("irda"); + Wizard::SetDesktopTitleAndIcon("irda"); Irda::Read (); Modified: trunk/irda/yast2-irda.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/irda/yast2-irda.spec.in?rev=6613… ============================================================================== --- trunk/irda/yast2-irda.spec.in (original) +++ trunk/irda/yast2-irda.spec.in Thu Sep 29 10:48:06 2011 @@ -4,7 +4,7 @@ Group: System/YaST License: GPLv2+ BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2 yast2-devtools yast2-testsuite -Requires: yast2 +Requires: yast2 >= 2.21.22 BuildArchitectures: noarch -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
71
Older →

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

YaST Commits September 2011