May 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r38053 - in /trunk/yast2: library/modules/Arch.ycp package/yast2.changes
by jsrain＠svn.opensuse.org 21 May '07

21 May '07

Author: jsrain Date: Mon May 21 09:47:25 2007 New Revision: 38053 URL: http://svn.opensuse.org/viewcvs/yast?rev=38053&view=rev Log: fixed chrp board detection (PPC) (#273606) Modified: trunk/yast2/library/modules/Arch.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/modules/Arch.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/modules/Arch.ycp?r… ============================================================================== --- trunk/yast2/library/modules/Arch.ycp (original) +++ trunk/yast2/library/modules/Arch.ycp Mon May 21 09:47:25 2007 @@ -235,8 +235,7 @@ string board = model["stdout"]:""; y2milestone("model %1 , device_type %2\n", model, device_type); // catch remaining IBM boards - if (device_type["stdout"]:"" == "chrp" - || device_type["stdout"]:"" == "chrp-cbea") + if (issubstring (device_type["stdout"]:"", "chrp")) { _board_compatible = "CHRP"; } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=… ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon May 21 09:47:25 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Mon May 21 10:45:35 CEST 2007 - jsrain(a)suse.cz + +- fixed chrp board detection (PPC) (#273606) + +------------------------------------------------------------------- Thu May 17 17:57:17 CEST 2007 - lslezak(a)suse.cz - Fixed testsuite for String.ycp -- 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] r38052 - in /trunk/kdump/src: dialogs.ycp uifunctions.ycp
by juhliarik＠svn.opensuse.org 21 May '07

21 May '07

Author: juhliarik Date: Mon May 21 09:16:23 2007 New Revision: 38052 URL: http://svn.opensuse.org/viewcvs/yast?rev=38052&view=rev Log: added corrections for UI Modified: trunk/kdump/src/dialogs.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/dialogs.ycp?rev=38052&… ============================================================================== --- trunk/kdump/src/dialogs.ycp (original) +++ trunk/kdump/src/dialogs.ycp Mon May 21 09:16:23 2007 @@ -233,13 +233,15 @@ "widget" : `custom, "custom_widget" : `VBox( `Frame ( _("Dump Level"), `VBox( - `Left(`HBox(`HSpacing(1),`HBox( + `Left(`HBox(`HSpacing(1),`VBox( `Left(`CheckBox(`id("zero_page"), "&Zero Page")), `Left(`CheckBox(`id("cache_page"), `opt(`notify), "Cach&e Page")), - `Left(`CheckBox(`id("cache_private"), `opt(`notify), "Cache Priva&te")), + `HBox(`HSpacing(2),`VBox( + `Left(`CheckBox(`id("cache_private"), `opt(`notify), "Cache Priva&te")) + )), `Left(`CheckBox(`id("user_data"), "&User Data")), - `Left(`CheckBox(`id("free_page"), "&Free Page")), - `HStretch () + `Left(`CheckBox(`id("free_page"), "&Free Page")) + //`VStretch () ))) ))), "init" : InitDumpLevel, Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=38… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Mon May 21 09:16:23 2007 @@ -107,13 +107,12 @@ term ssh = `VBox( `Frame(_("SSH (scp)"),`HBox(`HSpacing(1),`VBox( - `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), `Left(`HBox( - `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), - // text entry + `Left(`TextEntry(`id ("server"), _("Server Nam&e"))), `Left(`TextEntry(`id ("port"), _("P&ort"))), `HStretch () )), + `Left(`TextEntry( `id("dir"), _("&Directory on Server"))), // text entry `Left(`TextEntry(`id ("username"), _("&User Name"))), // password entry -- 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] r38051 - /tags/stable-2_15_24/installation/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:52:01 2007 New Revision: 38051 URL: http://svn.opensuse.org/viewcvs/yast?rev=38051&view=rev Log: Created tag stable-2_15_24 for installation Added: tags/stable-2_15_24/installation/ - copied from r38050, trunk/installation/ -- 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] r38050 - in /trunk/installation: VERSION package/yast2-installation.changes
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:50:20 2007 New Revision: 38050 URL: http://svn.opensuse.org/viewcvs/yast?rev=38050&view=rev Log: 2.15.24 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=38050&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Fri May 18 17:50:20 2007 @@ -1 +1 @@ -2.15.23 +2.15.24 Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-insta… ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Fri May 18 17:50:20 2007 @@ -2,6 +2,7 @@ Thu May 17 22:18:29 CEST 2007 - locilka(a)suse.cz - Progress dialog for initializing installation sources. +- 2.15.24 ------------------------------------------------------------------- Tue May 15 14:14:13 CEST 2007 - locilka(a)suse.cz -- 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] r38049 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:47:02 2007 New Revision: 38049 URL: http://svn.opensuse.org/viewcvs/yast?rev=38049&view=rev Log: Created tag stable-2_15_12 for update Added: tags/stable-2_15_12/update/ - copied from r38048, trunk/update/ -- 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] r38048 - /trunk/update/yast2-update.spec.in
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:45:17 2007 New Revision: 38048 URL: http://svn.opensuse.org/viewcvs/yast?rev=38048&view=rev Log: update-desktop-files into BuildRequires again Modified: trunk/update/yast2-update.spec.in Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Fri May 18 17:45:17 2007 @@ -1,7 +1,7 @@ @HEADER-COMMENT@ @HEADER@ -BuildRequires: yast2-add-on yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite +BuildRequires: yast2-add-on yast2-packager perl-XML-Writer yast2 yast2-devtools yast2-testsuite update-desktop-files Requires: yast2 Requires: yast2-installation Requires: yast2-packager -- 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] r38047 - /trunk/update/yast2-update.spec.in
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:35:28 2007 New Revision: 38047 URL: http://svn.opensuse.org/viewcvs/yast?rev=38047&view=rev Log: Added desktop file also back into spec file Modified: trunk/update/yast2-update.spec.in Modified: trunk/update/yast2-update.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/yast2-update.spec.in?rev=… ============================================================================== --- trunk/update/yast2-update.spec.in (original) +++ trunk/update/yast2-update.spec.in Fri May 18 17:35:28 2007 @@ -41,7 +41,7 @@ %files %defattr(-,root,root) @ybindir@/* -#@desktopdir@/*.desktop +@desktopdir@/*.desktop @moduledir@/* @clientdir@/*.ycp @yncludedir@/update -- 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] r38046 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:35:10 2007 New Revision: 38046 URL: http://svn.opensuse.org/viewcvs/yast?rev=38046&view=rev Log: Did not build :( Removed: tags/stable-2_15_12/update/ -- 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] r38045 - /tags/stable-2_15_12/update/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:27:31 2007 New Revision: 38045 URL: http://svn.opensuse.org/viewcvs/yast?rev=38045&view=rev Log: Created tag stable-2_15_12 for update Added: tags/stable-2_15_12/update/ - copied from r38044, trunk/update/ -- 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] r38044 - in /trunk/update: package/yast2-update.changes src/clients/update_proposal.ycp src/modules/Update.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:26:10 2007 New Revision: 38044 URL: http://svn.opensuse.org/viewcvs/yast?rev=38044&view=rev Log: - System Update functionality is allowed only when product versions are matching (can have a different name). Non-matching product means no possibility for System Update. Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp trunk/update/src/modules/Update.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri May 18 17:26:10 2007 @@ -3,7 +3,8 @@ - System Update icon is back in Control Center (#274064) - System Update functionality is allowed only when product versions - are matching (can have a different name). + are matching (can have a different name). Non-matching product + means no possibility for System Update. - Warning is printed when versions match but product names are different (#274064). - System Update temporarily renamed to 'FACTORY Update'. Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_propos… ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Fri May 18 17:26:10 2007 @@ -414,10 +414,32 @@ "raw_proposal" : [] ]; } + // TRANSLATORS: unknown product (label) + string update_from = _("Unknown product"); + if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { + update_from = Update::installedVersion["show"]:""; + } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { + update_from = Update::installedVersion["name"]:""; + } + + // TRANSLATORS: unknown product (label) + string update_to = _("Unknown product"); + if (Update::updateVersion["show"]:"" != "") { + update_to = Update::updateVersion["show"]:""; + } else if (Update::updateVersion["version"]:"" != "") { + update_to = Update::updateVersion["name"]:""; + } + // when versions don't match and upgrade is not allowed (running system) if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { - // proposal error - return $[ "warning" : _("Updating to another version is not supported from the running system."), + return $[ "warning" : sformat( + // TRANSLATORS: proposal error, %1 is the version of installed system + // %2 is the version being installed + _("Updating system to another version (%1 -> %2) is not supported on the running system.<br> +Please, boot from the installation media and use a normal upgrade +or disable installation sources of products with different versions."), + update_from, update_to + ), "warning_level" : `fatal, "raw_proposal" : [] ]; } Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?re… ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Fri May 18 17:26:10 2007 @@ -443,7 +443,11 @@ */ global define void fill_version_map (map <string, any>& data) { - data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + if (data["name"]:"?" == "?" && data["version"]:"?" == "?") { + data["nameandversion"] = "?"; + } else { + data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + } list <string> tmp0 = []; if (regexpmatch (data["version"]:"", " -")) { @@ -532,6 +536,7 @@ // get new product name integer num = size (Packages::theSources); + if (num <= 0) { y2error ("No source"); @@ -541,8 +546,35 @@ return false; } - map new_product = Pkg::SourceProductData (Packages::theSources[num-1]:0); - y2milestone ("First source product %1", new_product); + integer update_to_source = nil; + + // So-called System Update + if (Stage::normal()) { + foreach (integer source_id, Packages::theSources, { + map source_map = Pkg::SourceProductData(source_id); + + // source need to be described + if (source_map != $[]) { + if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + y2milestone ("Found matching product: %1", source_map); + // first valid product is selected + if (update_to_source == nil) + update_to_source = source_id; + } else { + y2error ("Found non-matching product: %1", source_map); + // every invalid product is selected + update_to_source = source_id; + } + } + }); + } + + // a fallback for Stage::normal(), default for !Stage::normal() + if (update_to_source == nil) update_to_source = Packages::theSources[num-1]:0; + + map new_product = Pkg::SourceProductData (update_to_source); + y2milestone ("Product to update to: %1 %2", update_to_source, new_product); + if (new_product == nil) { updateVersion["name"] = "?"; @@ -556,7 +588,12 @@ updateVersion["show"] = new_product["label"]:nil; if (updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + + if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { + updateVersion["show"] = "?"; + } else { + updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + } } updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; -- 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] r38043 - /trunk/packager/src/modules/ProductLicense.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 17:24:58 2007 New Revision: 38043 URL: http://svn.opensuse.org/viewcvs/yast?rev=38043&view=rev Log: Removing unnecessary milestone... Modified: trunk/packager/src/modules/ProductLicense.ycp Modified: trunk/packager/src/modules/ProductLicense.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/packager/src/modules/ProductLice… ============================================================================== --- trunk/packager/src/modules/ProductLicense.ycp (original) +++ trunk/packager/src/modules/ProductLicense.ycp Fri May 18 17:24:58 2007 @@ -66,8 +66,6 @@ lang_names_orig = $[]; } - y2milestone ("L: %1", lang_names_orig); - map<string,string> lang_names = $[]; // $[ "en" : "English (US)", "de" : "Deutsch" ] -- 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] r38042 - /branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp
by lslezak＠svn.opensuse.org 18 May '07

18 May '07

Author: lslezak Date: Fri May 18 17:17:46 2007 New Revision: 38042 URL: http://svn.opensuse.org/viewcvs/yast?rev=38042&view=rev Log: - sign also add-ons and YUM sources Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Modified: branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/cd-creator/src/Pr… ============================================================================== --- branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp (original) +++ branches/tmp/lslezak/cd-creator/src/ProductCreator.ycp Fri May 18 17:17:46 2007 @@ -1600,6 +1600,42 @@ return ret; } +global boolean SignSUSEtagsSource(string gpg_key, string dir, string passphrase) +{ + // export the key + boolean success = ExportPublicKey(gpg_key, dir); + // update SHA1 sums + success = success && UpdateContentFile(dir, "suse/setup/descr"); + + if (!success) + { + return false; + } + + // sign the source + success = SignSourceFiles(gpg_key, dir, passphrase); + + if (success) + { + // update directory.yast file + string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(dir)); + y2milestone("Updating %1/directory.yast ...", dir); + integer updated = (integer)SCR::Execute(.target.bash, command); + y2milestone("Updated: %1", updated == 0); + success = success && updated == 0; + } + + return success; +} + +global boolean SignYUMSource(string gpg_key, string dir, string passphrase) +{ + boolean ret = GPG::SignAsciiDetached(gpg_key, dir + "/repodata/repomd.xml", passphrase); + ret = ret && GPG::ExportAsciiPublicKey(gpg_key, dir + "/repodata/repomd.xml.key"); + + return ret; +} + global boolean SignSourceStep() { boolean success = true; @@ -1607,48 +1643,55 @@ // sign the files string gpg_key = Config["gpg_key"]:""; - // TODO FIXME sign correctly YUM sources - if (gpg_key != "") { - boolean signed = false; + string passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); - while (!signed) + // not aborted + if (passphrase != nil) { - string passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); - - if (passphrase == nil) - { - // aborted - break; - } - - // export the key - success = success && ExportPublicKey(gpg_key, skel_root); - // update SHA1 sums - success = success && UpdateContentFile(skel_root, "suse/setup/descr"); - // sign the source - signed = SignSourceFiles(gpg_key, skel_root, passphrase); + // sign each product + foreach(integer srcid, string dir, product_map, { + boolean signed = false; + map general_info = Pkg::SourceGeneralData(srcid); + + while (!signed) + { + if (general_info["type"]:"" == "YaST") + { + // sign the source + signed = SignSUSEtagsSource(gpg_key, skel_root + "/" + dir, passphrase); + } + else + { + // sign the source + signed = SignYUMSource(gpg_key, skel_root + "/" + dir, passphrase); + } - // yes/no popup: error message - if (!signed && !Popup::YesNo(_("Error: Could not digitally sign the source.\nTry it again?"))) - { - break; - } + // yes/no popup: error message + if (!signed) + { + if (Popup::YesNo(_("Error: Could not digitally sign the source.\nTry it again?"))) + { + passphrase = (Mode::commandline()) ? gpg_passphrase : GPGWidgets::AskPassphrasePopup(gpg_key); + } + else + { + break; + } + } + } - if (signed) - { - // update directory.yast file - string command = sformat("/bin/rm -f '%1/directory.yast' && /usr/bin/create_directory.yast '%1'", String::Quote(skel_root)); - y2milestone("Updating %1/directory.yast ...", skel_root); - integer updated = (integer)SCR::Execute(.target.bash, command); - y2milestone("Updated: %1", updated == 0); - success = success && updated == 0; - } + success = success && signed; + } + ); + } + else + { + success = false; } - success = success && signed; - + // insert the key into the installation initrd success = success && InsertKeyToInitrds(gpg_key, skel_root); } -- 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] r38041 - in /trunk/update: VERSION package/yast2-update.changes src/config/update.desktop
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:50:32 2007 New Revision: 38041 URL: http://svn.opensuse.org/viewcvs/yast?rev=38041&view=rev Log: System Update renamed to FACTORY Update 2.15.12 Modified: trunk/update/VERSION trunk/update/package/yast2-update.changes trunk/update/src/config/update.desktop Modified: trunk/update/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/VERSION?rev=38041&r1=3804… ============================================================================== --- trunk/update/VERSION (original) +++ trunk/update/VERSION Fri May 18 13:50:32 2007 @@ -1 +1 @@ -2.15.11 +2.15.12 Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.chan… ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri May 18 13:50:32 2007 @@ -6,7 +6,8 @@ are matching (can have a different name). - Warning is printed when versions match but product names are different (#274064). -- System Update temporarily renamed. +- System Update temporarily renamed to 'FACTORY Update'. +- 2.15.12 ------------------------------------------------------------------- Thu May 3 15:51:10 CEST 2007 - lslezak(a)suse.cz Modified: trunk/update/src/config/update.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/config/update.desktop… ============================================================================== --- trunk/update/src/config/update.desktop (original) +++ trunk/update/src/config/update.desktop Fri May 18 13:50:32 2007 @@ -19,6 +19,7 @@ Icon=yast-update Exec=/sbin/yast2 update -Name=Update to Newest Packages -GenericName=Update your system to the newest package versions +Name=FACTORY Update +GenericName=Update your system to the newest packages from FACTORY (expert tool) +Comment=Update your system to the newest packages from FACTORY (expert tool) X-KDE-SubstituteUID=true -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r38040 - /tags/stable-2_15_6/firewall/
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:33:54 2007 New Revision: 38040 URL: http://svn.opensuse.org/viewcvs/yast?rev=38040&view=rev Log: Created tag stable-2_15_6 for firewall Added: tags/stable-2_15_6/firewall/ - copied from r38039, trunk/firewall/ -- 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] r38039 - /trunk/firewall/src/firewall_proposal.ycp
by locilka＠svn.opensuse.org 18 May '07

18 May '07

Author: locilka Date: Fri May 18 13:33:13 2007 New Revision: 38039 URL: http://svn.opensuse.org/viewcvs/yast?rev=38039&view=rev Log: Suppor for both the old and the new way how to enable SSH during installation. Modified: trunk/firewall/src/firewall_proposal.ycp Modified: trunk/firewall/src/firewall_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/firewall/src/firewall_proposal.y… ============================================================================== --- trunk/firewall/src/firewall_proposal.ycp (original) +++ trunk/firewall/src/firewall_proposal.ycp Fri May 18 13:33:13 2007 @@ -125,7 +125,15 @@ // Enable SSH service } else if (chosen_id == "firewall--enable_ssh_in_proposal") { y2milestone("SSH enabled by a single-click"); - SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + + if (SuSEFirewallServices::IsKnownService("service:sshd")) { + y2milestone ("Service 'service:sshd' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("service:sshd"); + } else if (SuSEFirewallServices::IsKnownService("ssh")) { + y2warning ("Only service 'ssh' is known"); + SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh"); + } + ret = $[ "workflow_sequence" : `next ]; SuSEFirewallProposal::SetChangedByUser(true); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0