October 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r52745 - /tags/stable-2_17_29/printer/
by jsmeix＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jsmeix Date: Thu Oct 30 15:18:39 2008 New Revision: 52745 URL: http://svn.opensuse.org/viewcvs/yast?rev=52745&view=rev Log: Created tag stable-2_17_29 for printer Added: tags/stable-2_17_29/printer/ - copied from r52744, trunk/printer/ -- 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] r52744 - in /trunk/printer: VERSION package/yast2-printer.changes
by jsmeix＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jsmeix Date: Thu Oct 30 15:18:32 2008 New Revision: 52744 URL: http://svn.opensuse.org/viewcvs/yast?rev=52744&view=rev Log: - 2.17.29 Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=52744&r1=527… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Thu Oct 30 15:18:32 2008 @@ -1 +1 @@ -2.17.28 +2.17.29 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Thu Oct 30 15:18:32 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 30 15:10:48 CET 2008 - jsmeix(a)suse.de + +- Added Firewall Settings to the Printing via Network dialog. +- Added Firewall Settings to the Share Printers dialog. +- 2.17.29 + +------------------------------------------------------------------- Wed Oct 29 15:56:32 CET 2008 - jsmeix(a)suse.de - Added a AskForExistingFile popup dialog in the Add Driver -- 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] r52743 - /trunk/audit-laf/src/helps.ycp
by gs＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: gs Date: Thu Oct 30 15:07:03 2008 New Revision: 52743 URL: http://svn.opensuse.org/viewcvs/yast?rev=52743&view=rev Log: improve text Modified: trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5274… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Thu Oct 30 15:07:03 2008 @@ -111,7 +111,7 @@ to left and which action to perform if the system is running low.") + /* disk space dialog help 4/5 */ - _("If the action is set to EMAIL a warning mail will be send to the account specified in + _("If an action is set to EMAIL a warning mail will be send to the account specified in Action Mail Account" ) + /* disk space dialog help 5/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] r52742 - in /trunk/kdump: config/kdump.rnc src/Kdump.ycp src/kdump_finish.ycp src/uifunctions.ycp
by juhliarik＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: juhliarik Date: Thu Oct 30 15:06:11 2008 New Revision: 52742 URL: http://svn.opensuse.org/viewcvs/yast?rev=52742&view=rev Log: added several fixes for: autoyast, XEN... M kdump/config/kdump.rnc * deleted unsupported option KDUMP_DUMPDEV M kdump/src/uifunctions.ycp * fixed handling value of KDUMP_COPYKERNEL M kdump/src/Kdump.ycp M kdump/src/kdump_finish.ycp * added fix for problems with support of autoyast Modified: trunk/kdump/config/kdump.rnc trunk/kdump/src/Kdump.ycp trunk/kdump/src/kdump_finish.ycp trunk/kdump/src/uifunctions.ycp Modified: trunk/kdump/config/kdump.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/config/kdump.rnc?rev=52742… ============================================================================== --- trunk/kdump/config/kdump.rnc (original) +++ trunk/kdump/config/kdump.rnc Thu Oct 30 15:06:11 2008 @@ -25,7 +25,6 @@ element KDUMP_SAVEDIR { text }? & element KDUMP_KEEP_OLD_DUMPS { text }? & element KDUMP_FREE_DISK_SIZE { text }? & - element KDUMP_DUMPDEV { text }? & element KDUMP_VERBOSE { text }? & element KDUMP_DUMPLEVEL { text }? & element KDUMP_DUMPFORMAT { text }? & Modified: trunk/kdump/src/Kdump.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/Kdump.ycp?rev=52742&r1… ============================================================================== --- trunk/kdump/src/Kdump.ycp (original) +++ trunk/kdump/src/Kdump.ycp Thu Oct 30 15:06:11 2008 @@ -175,6 +175,14 @@ */ global string alocated_memory = "0"; +/** + * Boolean option indicates that Import() + * was called and data was proposed + * + * boolean true if import was called with data + */ + +global boolean import_called = false; /** @@ -212,12 +220,11 @@ "KEXEC_OPTIONS" : "", "KDUMP_RUNLEVEL" : "1", "KDUMP_IMMEDIATE_REBOOT" : "yes", - "KDUMP_COPY_KERNEL" : "no", + "KDUMP_COPY_KERNEL" : "yes", "KDUMP_TRANSFER" : "", "KDUMP_SAVEDIR" : "file:///var/log/dump", "KDUMP_KEEP_OLD_DUMPS" : "5", "KDUMP_FREE_DISK_SIZE" : "64", - "KDUMP_DUMPDEV" : "", "KDUMP_VERBOSE" : "3", "KDUMP_DUMPLEVEL" : "0", "KDUMP_DUMPFORMAT" : "compressed", //or "ELF" @@ -551,6 +558,30 @@ } +/** bnc #439881 - Don't use extended crashkernel syntax for Xen + * Fuction convert extended crashkernel value to old style :Y@X + * + * @param string - extended value of crashkernel + * @return string - old style value + */ + + +string convertCrashkernelForXEN(string crash) +{ + string crash_value = ""; + if (crash != "") + { + crash_value = getAlocatedMemory(crash)+"M"; + + if ((Arch::i386()) ||(Arch::x86_64()) || Arch::ppc64()) + crash_value = crash_value + "@16M"; + + } + y2milestone("Converting crashkernel value from: (%1) to :(%2)",crash, crash_value); + return crash_value; +} + + /** * Check if default boot section is Xen section @@ -609,7 +640,7 @@ { crash = section["xen_append"]:""; section_pos = section_position; - } + } }); } @@ -772,7 +803,7 @@ debug_KDUMP_SETTINGS["KDUMP_SAVEDIR"] = "********"; debug_KDUMP_SETTINGS["KDUMP_SMTP_PASSWORD"] = "********"; y2milestone("-------------KDUMP_SETTINGS-------------------"); - y2milestone("kdump configuration has been read without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1", debug_KDUMP_SETTINGS); + y2milestone("kdump configuration for writing without value \"KDUMP_SAVEDIR\" and \"KDUMP_SMTP_PASSWORD\": %1", debug_KDUMP_SETTINGS); y2milestone("---------------------------------------------"); foreach (string option_key, string option_val, KDUMP_SETTINGS, { @@ -802,21 +833,26 @@ { Bootloader::Read(); actual_boot_section = Bootloader::getDefaultSection (); - y2milestone("Default boot section is %1", actual_boot_section); CheckXenDefault(actual_boot_section); } + + y2milestone("Default boot section is %1", actual_boot_section); if (add_crashkernel_param) { - string crash_value = BuildCrashkernelValue (); - + + string crash_value = ""; + if (!Mode::autoinst()) + crash_value = BuildCrashkernelValue (); + if ((!crashkernel_param) || (crash_value != crashkernel_param_value)) { + if (Mode::autoinst()) + crash_value = crashkernel_param_value; // write crashkernel option to boot section if (section_pos == -1) { result = Bootloader::setKernelParam (actual_boot_section, "crashkernel", crash_value); } else { - - BootCommon::sections[section_pos, "xen_append"]= "crashkernel="+crash_value; + BootCommon::sections[section_pos, "xen_append"]= "crashkernel="+convertCrashkernelForXEN(crash_value); // added flag which means that section was changed bnc #432651 BootCommon::sections[section_pos, "__changed"] = true; result = true; @@ -936,7 +972,15 @@ y2milestone("Installation doesn't support kdump."); return true; } + + } + + if ((Mode::installation() || Mode::autoinst()) && (!add_crashkernel_param)) + { + y2milestone("Skip writing of configuration for kdump during installation"); + return true; } + // We do not set help text here, because it was set outside Progress::New(caption, " ", steps, [ /* Progress stage 1/2 */ @@ -989,7 +1033,7 @@ if (Arch::ppc64()) kdump_packages = add(kdump_packages, "kernel-kdump"); else - kdump_packages = add(kdump_packages, "kdump"); + kdump_packages = add(kdump_packages, "kdump"); } } @@ -1002,9 +1046,13 @@ { if (!propose_called) { - // set adding boot option... + // propose disable kdump if PC has less than 1024MB RAM + if (total_memory < 1024) + add_crashkernel_param = false; + else + add_crashkernel_param = true; + crashkernel_param = false; - add_crashkernel_param = true; // added defualt settings KDUMP_SETTINGS = DEFAULT_CONFIG; } @@ -1056,25 +1104,19 @@ */ global define void Propose () { - y2milestone("Proposing new settings of kdump"); - - // set default values for global variables - ProposeGlobalVars(); // read available memory ReadAvailableMemory (); - - // propose disable kdump if PC has less than 1024MB RAM - if (total_memory < 1024) - add_crashkernel_param = false; + // set default values for global variables + ProposeGlobalVars(); // add packages for installation AddPackages(); // select packages for installation CheckPackages(); - } + /** * Create a textual summary and a list of unconfigured cards * @return summary of the current configuration @@ -1117,6 +1159,7 @@ */ global define boolean Import (map settings) { + y2milestone("Importing settings for kdump"); crashkernel_param_value = settings["crash_kernel"]:""; add_crashkernel_param = settings["add_crash_kernel"]:false; boolean result = true; @@ -1127,7 +1170,10 @@ string val = (string) my_import_map[str_key]:nil; if (val != nil) KDUMP_SETTINGS[str_key] = val; if (val == nil) KDUMP_SETTINGS[str_key] = DEFAULT_CONFIG[str_key]:nil; - }); + }); + if ((haskey(settings, "crash_kernel")) || (haskey(settings, "add_crash_kernel")) || + (size(my_import_map) > 0)) + import_called = true; return result; } /* EOF */ Modified: trunk/kdump/src/kdump_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/kdump_finish.ycp?rev=5… ============================================================================== --- trunk/kdump/src/kdump_finish.ycp (original) +++ trunk/kdump/src/kdump_finish.ycp Thu Oct 30 15:06:11 2008 @@ -47,6 +47,9 @@ } else if (func == "Write") { + // propose settings for kdump if autoyast doesn't include settings for yast2-kdump + if ((!Kdump::import_called) && (Mode::autoinst())) + Kdump::Propose(); Kdump::Write(); } else Modified: trunk/kdump/src/uifunctions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/kdump/src/uifunctions.ycp?rev=52… ============================================================================== --- trunk/kdump/src/uifunctions.ycp (original) +++ trunk/kdump/src/uifunctions.ycp Thu Oct 30 15:06:11 2008 @@ -186,7 +186,6 @@ } else { Kdump::add_crashkernel_param = false; } - } /** @@ -1314,7 +1313,7 @@ */ void InitEnableCopyKernel (string key) { - if (Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"]:"false" == "true") { + if (Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"]:"no" == "yes") { UI::ChangeWidget(`id("EnableCopyKernel"), `Value, true); } else { UI::ChangeWidget(`id("EnableCopyKernel"), `Value, false); @@ -1331,9 +1330,9 @@ void StoreEnableCopyKernel (string key, map event) { boolean value = (boolean) UI::QueryWidget(`id("EnableCopyKernel"), `Value); if (!value) { - Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "false"; + Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "no"; } else { - Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "true"; + Kdump::KDUMP_SETTINGS["KDUMP_COPY_KERNEL"] = "yes"; } } -- 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] r52741 - in /trunk/printer/src: printingvianetwork.ycp sharing.ycp
by jsmeix＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: jsmeix Date: Thu Oct 30 15:05:19 2008 New Revision: 52741 URL: http://svn.opensuse.org/viewcvs/yast?rev=52741&view=rev Log: Added Firewall Settings to the Printing via Network dialog. Fixed bug in Firewall Settings for the Share Printers dialog. Modified: trunk/printer/src/printingvianetwork.ycp trunk/printer/src/sharing.ycp Modified: trunk/printer/src/printingvianetwork.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/printingvianetwork.y… ============================================================================== --- trunk/printer/src/printingvianetwork.ycp (original) +++ trunk/printer/src/printingvianetwork.ycp Thu Oct 30 15:05:19 2008 @@ -55,6 +55,9 @@ // remote CUPS servers with specific addresses // where the specific addresses are specified in a TextEntry below: string browse_allow_specific_string = _("only specific addresses"); +// Firewall related widget types: +boolean firewall_first_browsing_widget_is_checkbox = false; +boolean firewall_second_browsing_widget_is_checkbox = false; term widgetNetworkPrinting = `VBox ( `VStretch(), @@ -122,6 +125,36 @@ // from where remote printer information is accepted: _("(each nnn.nnn.nnn.nnn or nnn.nnn.nnn.nnn/mmm.mmm.mmm.mmm separated by one space)") ) + ), + `Left + ( `Label + ( `id(`firewall_browsing_settings_label), + // A caption to make a Firewall settings + // to allow incomming printer information + // from remote CUPS servers: + _("Firewall Settings") + ) + ), + `HBox + ( `HSpacing( 2 ), + `VBox + ( `Left + ( `ReplacePoint + ( `id(`firewall_first_browsing_replace_point), + `Empty + ( `id(`firewall_first_browsing_widget) + ) + ) + ), + `Left + ( `ReplacePoint + ( `id(`firewall_second_browsing_replace_point), + `Empty + ( `id(`firewall_second_browsing_widget) + ) + ) + ) + ) ) ) ), @@ -341,6 +374,30 @@ boolean ApplyNetworkPrintingSettings() { printing_via_network_has_changed = false; + // Do the Firewall stuff first of all: + boolean firewall_allow_browsing_from_int = true; + boolean firewall_deny_browsing_from_ext = true; + if( firewall_first_browsing_widget_is_checkbox ) + { firewall_allow_browsing_from_int = (boolean)UI::QueryWidget( `firewall_first_browsing_widget, `Value ); + y2milestone( "firewall_allow_browsing_from_int value: '%1'", firewall_allow_browsing_from_int ); + Printer::firewall_config["ui_browsing_from_int"] = firewall_allow_browsing_from_int; + } + if( firewall_second_browsing_widget_is_checkbox ) + { firewall_deny_browsing_from_ext = (boolean)UI::QueryWidget( `firewall_second_browsing_widget, `Value ); + y2milestone( "firewall_deny_browsing_from_ext value: '%1'", firewall_deny_browsing_from_ext ); + Printer::firewall_config["ui_deny_from_ext"] = firewall_deny_browsing_from_ext; + } + if( Printer::firewall_config["browsing_from_int"]:false != Printer::firewall_config["ui_browsing_from_int"]:true + || Printer::firewall_config["deny_from_ext"]:false != Printer::firewall_config["ui_deny_from_ext"]:true + ) + { // The user has changed a Firewall setting: + printing_via_network_has_changed = true; + if( ! Printer::FirewallConfig( "write" ) ) + { // No error message here because Printer::FirewallConfig shows already error messages: + return false; + } + } + // Do the CUPS stuff after the Firewall stuff. // Get the actual settings and values from the dialog: any current_radio_button = UI::QueryWidget( `id(`browsing_or_client_only_check_boxes), `CurrentButton ); any current_browse_allow = UI::QueryWidget( `id(`browse_allow_combo_box), `Value ); @@ -780,6 +837,100 @@ UI::ChangeWidget( `id(`browsing_off_radio_button), `Value, true ); } } + // Determine the Firewall settings. + // Ignore errors because Printer::FirewallConfig results a firewall_config fallback map. + Printer::FirewallConfig( "read" ); + // Set the content and values for the firewall related widgets in the dialog: + if( ! Printer::firewall_config["suse_firewall_used"]:true ) + { // Not the Suse Firewall but another firewall is used: + UI::ReplaceWidget( `firewall_first_browsing_replace_point, + `Label + ( `id(`firewall_first_browsing_widget), + // Label when not the Suse Firewall but another firewall is used: + _("Not the Suse Firewall but another firewall is used") + ) + ); + UI::ReplaceWidget( `firewall_second_browsing_replace_point, + `Empty + ( `id(`firewall_second_browsing_widget) + ) + ); + } + else + { // The Suse Firewall is used: + if( ! Printer::firewall_config["firewall_active"]:true ) + { // The Suse Firewall is not running: + UI::ReplaceWidget( `firewall_first_browsing_replace_point, + `Label + ( `id(`firewall_first_browsing_widget), + // Label when the Suse Firewall is not running: + _("The Suse Firewall is not active") + ) + ); + UI::ReplaceWidget( `firewall_second_browsing_replace_point, + `Empty + ( `id(`firewall_second_browsing_widget) + ) + ); + } + else + { // The Suse Firewall is running: + if( ! Printer::firewall_config["no_firewall_for_int"]:true ) + { // The Suse Firewall does potect the INT zone: + // Let the user deny or allow CUPS Browsing from the INT zone here: + UI::ReplaceWidget( `firewall_first_browsing_replace_point, + `CheckBox + ( `id(`firewall_first_browsing_widget), + // CheckBox whether or not the Suse Firewall allows + // incomming printer information (CUPS Browsing packages) + // from the internal network zone (INT zone): + _("Allow printer information from the internal network zone"), + Printer::firewall_config["browsing_from_int"]:true + ) + ); + firewall_first_browsing_widget_is_checkbox = true; + } + else + { // The Suse Firewall does not potect the INT zone: + UI::ReplaceWidget( `firewall_first_browsing_replace_point, + `Label + ( `id(`firewall_first_browsing_widget), + // Label when the Suse Firewall does not potect the internal network zone + // which means that incomming printer information from the INT zone is allowed: + _("Printer information from the internal network zone is allowed") + ) + ); + } + if( ! Printer::firewall_config["deny_from_ext"]:true ) + { // The Suse Firewall does not deny incomming printer information from the EXT zone. + // Let the user deny incomming printer information from the EXT zone here: + UI::ReplaceWidget( `firewall_second_browsing_replace_point, + `CheckBox + ( `id(`firewall_second_browsing_widget), + // CheckBox whether or not the Suse Firewall denies + // incomming printer information from the external network zone. + // This is done by denying any access from the EXT zone. + _("Deny access and printer information from the external network zone"), + false + ) + ); + firewall_second_browsing_widget_is_checkbox = true; + } + else + { // The Suse Firewall denies incomming printer information from the EXT zone. + // Do not let the user allow incomming printer information from the EXT zone here: + UI::ReplaceWidget( `firewall_second_browsing_replace_point, + `Label + ( `id(`firewall_second_browsing_widget), + // Label when the Suse Firewall denies printer information + // from the external network zone. + // This is done by denying any access from the EXT zone. + _("Access and printer information from the external network zone is denied") + ) + ); + } + } + } y2milestone( "leaving initNetworkPrinting with\ninitial_radio_button = '%1'\ninitial_browse_allow = '%2'\ninitial_browse_allow_input_value = '%3'\ninitial_server_name_input_value = '%4'", initial_radio_button, initial_browse_allow, initial_browse_allow_input_value, initial_server_name_input_value ); } Modified: trunk/printer/src/sharing.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/sharing.ycp?rev=5274… ============================================================================== --- trunk/printer/src/sharing.ycp (original) +++ trunk/printer/src/sharing.ycp Thu Oct 30 15:05:19 2008 @@ -49,8 +49,8 @@ list< term > initial_interface_table_items = []; string initial_allow_input_value = ""; string initial_browse_address_input_value = ""; -boolean firewall_first_widget_is_checkbox = false; -boolean firewall_second_widget_is_checkbox = false; +boolean firewall_first_sharing_widget_is_checkbox = false; +boolean firewall_second_sharing_widget_is_checkbox = false; term widgetSharing = `VBox ( `VSpacing( 1 ), @@ -200,7 +200,7 @@ `VSpacing( 1 ), `Left ( `Label - ( `id(`firewall_settings_label), + ( `id(`firewall_sharing_settings_label), // A caption to make Firewall settings to allow remote access to CUPS: _("Firewall Settings") ) @@ -210,17 +210,17 @@ `VBox ( `Left ( `ReplacePoint - ( `id(`firewall_first_replace_point), + ( `id(`firewall_first_sharing_replace_point), `Empty - ( `id(`firewall_first_widget) + ( `id(`firewall_first_sharing_widget) ) ) ), `Left ( `ReplacePoint - ( `id(`firewall_second_replace_point), + ( `id(`firewall_second_sharing_replace_point), `Empty - ( `id(`firewall_second_widget) + ( `id(`firewall_second_sharing_widget) ) ) ) @@ -280,18 +280,18 @@ // Do the Firewall stuff first of all: boolean firewall_allow_from_int = true; boolean firewall_deny_from_ext = true; - if( firewall_first_widget_is_checkbox ) - { firewall_allow_from_int = (boolean)UI::QueryWidget( `firewall_first_widget, `Value ); + if( firewall_first_sharing_widget_is_checkbox ) + { firewall_allow_from_int = (boolean)UI::QueryWidget( `firewall_first_sharing_widget, `Value ); y2milestone( "firewall_allow_from_int value: '%1'", firewall_allow_from_int ); Printer::firewall_config["ui_access_from_int"] = firewall_allow_from_int; } - if( firewall_second_widget_is_checkbox ) - { firewall_deny_from_ext = (boolean)UI::QueryWidget( `firewall_second_widget, `Value ); + if( firewall_second_sharing_widget_is_checkbox ) + { firewall_deny_from_ext = (boolean)UI::QueryWidget( `firewall_second_sharing_widget, `Value ); y2milestone( "firewall_deny_from_ext value: '%1'", firewall_deny_from_ext ); Printer::firewall_config["ui_deny_from_ext"] = firewall_deny_from_ext; } - if( Printer::firewall_config["access_from_int"]:false != firewall_allow_from_int - || Printer::firewall_config["deny_from_ext"]:false != firewall_deny_from_ext + if( Printer::firewall_config["access_from_int"]:false != Printer::firewall_config["ui_access_from_int"]:true + || Printer::firewall_config["deny_from_ext"]:false != Printer::firewall_config["ui_deny_from_ext"]:true ) { // The user has changed a Firewall setting: sharing_has_changed = true; @@ -597,9 +597,9 @@ UI::ChangeWidget( `allow_input_label, `Enabled, false ); UI::ChangeWidget( `browse_address_input, `Enabled, false ); UI::ChangeWidget( `browse_address_input_label, `Enabled, false ); - UI::ChangeWidget( `firewall_settings_label, `Enabled, false ); - UI::ChangeWidget( `firewall_first_widget, `Enabled, false ); - UI::ChangeWidget( `firewall_second_widget, `Enabled, false ); + UI::ChangeWidget( `firewall_sharing_settings_label, `Enabled, false ); + UI::ChangeWidget( `firewall_first_sharing_widget, `Enabled, false ); + UI::ChangeWidget( `firewall_second_sharing_widget, `Enabled, false ); } // Regardless whether or not the "Share Printers" dialog is useless, // fill in the values of the current settings in the system: @@ -813,16 +813,16 @@ // Set the content and values for the firewall related widgets in the dialog: if( ! Printer::firewall_config["suse_firewall_used"]:true ) { // Not the Suse Firewall but another firewall is used: - UI::ReplaceWidget( `firewall_first_replace_point, + UI::ReplaceWidget( `firewall_first_sharing_replace_point, `Label - ( `id(`firewall_first_widget), + ( `id(`firewall_first_sharing_widget), // Label when not the Suse Firewall but another firewall is used: _("Not the Suse Firewall but another firewall is used") ) ); - UI::ReplaceWidget( `firewall_second_replace_point, + UI::ReplaceWidget( `firewall_second_sharing_replace_point, `Empty - ( `id(`firewall_second_widget) + ( `id(`firewall_second_sharing_widget) ) ); } @@ -830,16 +830,16 @@ { // The Suse Firewall is used: if( ! Printer::firewall_config["firewall_active"]:true ) { // The Suse Firewall is not running: - UI::ReplaceWidget( `firewall_first_replace_point, + UI::ReplaceWidget( `firewall_first_sharing_replace_point, `Label - ( `id(`firewall_first_widget), + ( `id(`firewall_first_sharing_widget), // Label when the Suse Firewall is not running: _("The Suse Firewall is not active") ) ); - UI::ReplaceWidget( `firewall_second_replace_point, + UI::ReplaceWidget( `firewall_second_sharing_replace_point, `Empty - ( `id(`firewall_second_widget) + ( `id(`firewall_second_sharing_widget) ) ); } @@ -848,21 +848,21 @@ if( ! Printer::firewall_config["no_firewall_for_int"]:true ) { // The Suse Firewall does potect the INT zone: // Let the user deny or allow CUPS access from the INT zone here: - UI::ReplaceWidget( `firewall_first_replace_point, + UI::ReplaceWidget( `firewall_first_sharing_replace_point, `CheckBox - ( `id(`firewall_first_widget), + ( `id(`firewall_first_sharing_widget), // CheckBox whether or not the Suse Firewall allows CUPS access from the INT zone: _("Allow access from the internal network zone"), Printer::firewall_config["access_from_int"]:true ) ); - firewall_first_widget_is_checkbox = true; + firewall_first_sharing_widget_is_checkbox = true; } else { // The Suse Firewall does not potect the INT zone: - UI::ReplaceWidget( `firewall_first_replace_point, + UI::ReplaceWidget( `firewall_first_sharing_replace_point, `Label - ( `id(`firewall_first_widget), + ( `id(`firewall_first_sharing_widget), // Label when the Suse Firewall does not potect the internal network zone // which means that CUPS access from the INT zone is allowed: _("Access from the internal network zone is allowed") @@ -872,22 +872,22 @@ if( ! Printer::firewall_config["deny_from_ext"]:true ) { // The Suse Firewall does not deny CUPS access from the EXT zone. // Let the user deny CUPS access from the EXT zone here: - UI::ReplaceWidget( `firewall_second_replace_point, + UI::ReplaceWidget( `firewall_second_sharing_replace_point, `CheckBox - ( `id(`firewall_second_widget), + ( `id(`firewall_second_sharing_widget), // CheckBox whether or not the Suse Firewall denies CUPS access from the EXT zone: _("Deny access from the external network zone"), false ) ); - firewall_second_widget_is_checkbox = true; + firewall_second_sharing_widget_is_checkbox = true; } else { // The Suse Firewall denies CUPS access from the EXT zone. // Do not let the user allow CUPS access from the EXT zone here: - UI::ReplaceWidget( `firewall_second_replace_point, + UI::ReplaceWidget( `firewall_second_sharing_replace_point, `Label - ( `id(`firewall_second_widget), + ( `id(`firewall_second_sharing_widget), // Label when the Suse Firewall denies CUPS access from the external network zone: _("Access from the external network zone is denied") ) -- 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] r52740 - /trunk/audit-laf/package/yast2-audit-laf.changes
by gs＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: gs Date: Thu Oct 30 15:00:53 2008 New Revision: 52740 URL: http://svn.opensuse.org/viewcvs/yast?rev=52740&view=rev Log: user defined computer name Modified: trunk/audit-laf/package/yast2-audit-laf.changes Modified: trunk/audit-laf/package/yast2-audit-laf.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/package/yast2-audit-la… ============================================================================== --- trunk/audit-laf/package/yast2-audit-laf.changes (original) +++ trunk/audit-laf/package/yast2-audit-laf.changes Thu Oct 30 15:00:53 2008 @@ -4,7 +4,10 @@ - Allow to enter any log file name (replace AskForExistingFile by AskForSaveFileName) - Add input fields to specify a script (for option EXEC) -- Better arrangements of input fields +- Better arrangements of some input fields +- Enable input field for user defined name only if computer name + format is set to USER, check for empty computer name +- 2.17.5 ------------------------------------------------------------------- Tue Oct 7 13:56:18 CEST 2008 - gs(a)suse.de -- 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] r52739 - in /trunk/storage/storage/src: ./ include/ proposal/
by aschnell＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: aschnell Date: Thu Oct 30 14:59:13 2008 New Revision: 52739 URL: http://svn.opensuse.org/viewcvs/yast?rev=52739&view=rev Log: - removed obsolete include statements Modified: trunk/storage/storage/src/include/auto_part_functions.ycp trunk/storage/storage/src/include/custom_part_check_generated.ycp trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/lvm_lib.ycp trunk/storage/storage/src/inst_prepdisk.ycp trunk/storage/storage/src/inst_resize_ui.ycp trunk/storage/storage/src/inst_target_part.ycp trunk/storage/storage/src/proposal/partitions_proposal.ycp Modified: trunk/storage/storage/src/include/auto_part_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/auto… ============================================================================== --- trunk/storage/storage/src/include/auto_part_functions.ycp (original) +++ trunk/storage/storage/src/include/auto_part_functions.ycp Thu Oct 30 14:59:13 2008 @@ -41,8 +41,6 @@ textdomain "storage"; - include "partitioning/partition_defines.ycp"; - // -------------------------------------------------------------- // helper functions Modified: trunk/storage/storage/src/include/custom_part_check_generated.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_check_generated.ycp (original) +++ trunk/storage/storage/src/include/custom_part_check_generated.ycp Thu Oct 30 14:59:13 2008 @@ -35,8 +35,9 @@ import "Label"; import "Product"; import "AutoinstData"; + import "FileSystems"; + import "Stage"; - include "partitioning/partition_defines.ycp"; include "partitioning/custom_part_helptexts.ycp"; textdomain "storage"; Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Oct 30 14:59:13 2008 @@ -26,7 +26,6 @@ import "Product"; import "FileSystems"; - #include "partitioning/partition_defines.ycp"; define string mountVar( map var, map root, string rdev, string mp, map<string,map> targetMap ) Modified: trunk/storage/storage/src/include/lvm_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/lvm_… ============================================================================== --- trunk/storage/storage/src/include/lvm_lib.ycp (original) +++ trunk/storage/storage/src/include/lvm_lib.ycp Thu Oct 30 14:59:13 2008 @@ -19,9 +19,6 @@ import "Integer"; -include "partitioning/partition_defines.ycp"; - - // TODO: cleanup void new_vg_list( list vg_list ); Modified: trunk/storage/storage/src/inst_prepdisk.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_prepdis… ============================================================================== --- trunk/storage/storage/src/inst_prepdisk.ycp (original) +++ trunk/storage/storage/src/inst_prepdisk.ycp Thu Oct 30 14:59:13 2008 @@ -29,6 +29,7 @@ { textdomain "storage"; + import "Installation"; import "Mode"; import "Stage"; @@ -38,12 +39,11 @@ import "String"; import "SlideShow"; import "StorageClients"; - + import "Popup"; + if (Mode::update ()) return `auto; - include "partitioning/partition_defines.ycp"; - boolean test_mode = Mode::test(); boolean this_is_for_real = !test_mode; Modified: trunk/storage/storage/src/inst_resize_ui.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_resize_… ============================================================================== --- trunk/storage/storage/src/inst_resize_ui.ycp (original) +++ trunk/storage/storage/src/inst_resize_ui.ycp Thu Oct 30 14:59:13 2008 @@ -21,7 +21,6 @@ import "Wizard"; import "Product"; - include "partitioning/partition_defines.ycp"; include "partitioning/do_proposal_flexible.ycp"; // Automatically return if resizing is not requested Modified: trunk/storage/storage/src/inst_target_part.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/inst_target_… ============================================================================== --- trunk/storage/storage/src/inst_target_part.ycp (original) +++ trunk/storage/storage/src/inst_target_part.ycp Thu Oct 30 14:59:13 2008 @@ -21,6 +21,8 @@ import "Partitions"; import "Product"; import "FileSystems"; + import "Label"; + import "Popup"; // flag for deleting a windows partition integer win_partition_to_delete = -1; @@ -55,10 +57,7 @@ include "partitioning/auto_part_functions.ycp"; include "partitioning/auto_part_prepare.ycp"; include "partitioning/auto_part_ui.ycp"; - include "partitioning/partition_defines.ycp"; include "partitioning/auto_part_create.ycp"; - import "Label"; - import "Popup"; // Displays a popup with the message (can be dismissed with OK). // After that only `abort or `back is allowed Modified: trunk/storage/storage/src/proposal/partitions_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/proposal/par… ============================================================================== --- trunk/storage/storage/src/proposal/partitions_proposal.ycp (original) +++ trunk/storage/storage/src/proposal/partitions_proposal.ycp Thu Oct 30 14:59:13 2008 @@ -16,7 +16,6 @@ import "PackagesProposal"; include "wizard/sequencer.ycp"; - include "partitioning/partition_defines.ycp"; include "partitioning/do_proposal_flexible.ycp"; string func = (string) WFM::Args(0); -- 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] r52738 - in /trunk/audit-laf/src: AuditLaf.ycp complex.ycp dialogs.ycp helps.ycp
by gs＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: gs Date: Thu Oct 30 14:49:05 2008 New Revision: 52738 URL: http://svn.opensuse.org/viewcvs/yast?rev=52738&view=rev Log: enable input field computer name only if format USER is selected, check for empty name Modified: trunk/audit-laf/src/AuditLaf.ycp trunk/audit-laf/src/complex.ycp trunk/audit-laf/src/dialogs.ycp trunk/audit-laf/src/helps.ycp Modified: trunk/audit-laf/src/AuditLaf.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/AuditLaf.ycp?rev=5… ============================================================================== --- trunk/audit-laf/src/AuditLaf.ycp (original) +++ trunk/audit-laf/src/AuditLaf.ycp Thu Oct 30 14:49:05 2008 @@ -230,7 +230,6 @@ "dispatcher" : ["/sbin/audispd"], "disp_qos" : ["lossy"], "name_format": ["NONE"], - "name": [""], "max_log_file" : ["5"], "max_log_file_action" : ["ROTATE"], "space_left" : ["75"], @@ -273,7 +272,7 @@ global boolean SetAuditdOption( string key, string value ) { list <string> option_list = []; - // FIXME - allow empty values, e.g. for computer name (but not if FORMAT is set to USER) + // Don't set empty values (seems that 'auditd' doesn't like it) if ( value != "" ) { option_list = add( option_list, value ); Modified: trunk/audit-laf/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/complex.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/complex.ycp (original) +++ trunk/audit-laf/src/complex.ycp Thu Oct 30 14:49:05 2008 @@ -105,8 +105,15 @@ "name_format" ], { UI::ChangeWidget(`id(key), `Value, toupper(AuditLaf::GetAuditdOption(key)) ); + if ( key == "name_format" ) + { + if ( toupper(AuditLaf::GetAuditdOption(key) ) == "USER" ) + UI::ChangeWidget( `id("name"), `Enabled, true ); + else + UI::ChangeWidget( `id("name"), `Enabled, false ); + } }); - + y2milestone( "Init log file settings"); } @@ -123,6 +130,15 @@ UI::ChangeWidget( `id("log_file"), `Value, file_name ); y2milestone( "Logfile set to: %1", file_name ); } + else if ( action == "name_format" ) + { + string option = (string)UI::QueryWidget( `id("name_format"), `Value ); + if ( option == "USER" ) + UI::ChangeWidget( `id("name"), `Enabled, true ); + else + UI::ChangeWidget( `id("name"), `Enabled, false ); + + } return nil; } @@ -142,13 +158,27 @@ "max_log_file", "flush", "max_log_file_action", - "name_format", - "name" + "name_format" ], { AuditLaf::SetAuditdOption( key, (string) UI::QueryWidget(`id(key), `Value) ); }); - y2milestone( "Store log file settings" ); + if ( AuditLaf::GetAuditdOption( "name_format" ) == "USER" ) + { + if ( (string) UI::QueryWidget( `id("name"), `Value ) == "" ) + { + Report::Error(_("The 'User Defined Name' is NOT set although +the 'Computer Name Format' is set to 'USER'. +Setting the format to 'NONE' (default)." ) ); + AuditLaf::SetAuditdOption( "name_format", "NONE" ); + } + else + { + AuditLaf::SetAuditdOption( "name", (string) UI::QueryWidget(`id("name"), `Value) ); + } + } + + y2milestone( "Store log file settings" ); } /* Modified: trunk/audit-laf/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/dialogs.ycp?rev=52… ============================================================================== --- trunk/audit-laf/src/dialogs.ycp (original) +++ trunk/audit-laf/src/dialogs.ycp Thu Oct 30 14:49:05 2008 @@ -115,7 +115,8 @@ _("Computer Names"), `HBox( // ComboBox label - `HWeight( 1, `ComboBox(`id("name_format"), _("&Computer Name Format"), + `HWeight( 1, `ComboBox(`id("name_format"), `opt(`notify), + _("&Computer Name Format"), [`item(`id("NONE"), "NONE" ), `item(`id("HOSTNAME"), "HOSTNAME", true ), `item(`id("FQD"), "FQD" ), Modified: trunk/audit-laf/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/audit-laf/src/helps.ycp?rev=5273… ============================================================================== --- trunk/audit-laf/src/helps.ycp (original) +++ trunk/audit-laf/src/helps.ycp Thu Oct 30 14:49:05 2008 @@ -83,16 +83,20 @@ _("Computer Name Format describes how to write the computer name to the log file. If User is set the User Defined Name is used. "), - /* dispatcher dialog help 1/3 */ + /* dispatcher dialog help 1/4 */ "dispatcher" : _("<big>Auditd Dispatcher Configuration</big> Detailed information about the dispatcher settings can be obtained from 'man auditd.conf'. ") + - /* dispatcher dialog help 2/3 */ + /* dispatcher dialog help 2/4 */ _("Dispatcher: The dispatcher program is started by the audit daemon and gets all audit events on stdin.") + - /* dispatcher dialog help 3/3 */ + /* dispatcher dialog help 3/4 */ _("Communication: Controls the communication -between the daemon and the dispatcher program."), +between the daemon and the dispatcher program.") + + /* dispatcher dialog help 4/4 */ + _("The dispatcher 'audispd' is an audit event multiplexor +(for more information see 'man audispd' and 'man audispd.conf'."), + /* disk space dialog help 1/5 */ "diskspace_settings" : _("<big>Auditd Disk Space Configuration</big> The settings made here refer to disk space on log partition. -- 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] r52737 - /tags/stable-2_17_23/installation/
by locilka＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: locilka Date: Thu Oct 30 14:46:18 2008 New Revision: 52737 URL: http://svn.opensuse.org/viewcvs/yast?rev=52737&view=rev Log: Created tag stable-2_17_23 for installation Added: tags/stable-2_17_23/installation/ - copied from r52736, 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] r52736 - in /trunk/installation: VERSION package/yast2-installation.changes src/clients/inst_extrasources.ycp
by locilka＠svn.opensuse.org 30 Oct '08

30 Oct '08

Author: locilka Date: Thu Oct 30 14:44:03 2008 New Revision: 52736 URL: http://svn.opensuse.org/viewcvs/yast?rev=52736&view=rev Log: - Saving sources at the end of inst_extrasources if some were added (bnc #440184). - 2.17.23 Modified: trunk/installation/VERSION trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_extrasources.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=52736&r… ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Thu Oct 30 14:44:03 2008 @@ -1 +1 @@ -2.17.22 +2.17.23 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 Thu Oct 30 14:44:03 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Oct 30 14:42:15 CET 2008 - locilka(a)suse.cz + +- Saving sources at the end of inst_extrasources if some were + added (bnc #440184). +- 2.17.23 + +------------------------------------------------------------------- Mon Oct 27 10:18:47 CET 2008 - locilka(a)suse.cz - Added lnussel's patch to run set_polkit_default_privs at Modified: trunk/installation/src/clients/inst_extrasources.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_ex… ============================================================================== --- trunk/installation/src/clients/inst_extrasources.ycp (original) +++ trunk/installation/src/clients/inst_extrasources.ycp Thu Oct 30 14:44:03 2008 @@ -5,9 +5,9 @@ * Authors: Ladislav SlezÃ¡k <lslezak(a)suse.cz> * Lukas Ocilka <locilka(a)suse.cz> * - * Assumptions: - * - the sources will be saved afterwards - * (which means that running this client alone will not work) + * This client loads the target and initializes the package manager. + * Adds all sources defined in control file (software->extra_urls) + * and stores them at the end. * * $Id$ */ @@ -24,6 +24,7 @@ // We need the constructor import "ProductControl"; import "Installation"; +import "PackageCallbacks"; /** * Returns list of maps of repositories to register. See bnc #381360. @@ -184,6 +185,11 @@ y2milestone ("syncing to zmd"); boolean synced = SourceManager::SyncAddedAndDeleted (added_ids, []); y2milestone ("sync status: %1", synced); + + // If any source has been added, store the sources + // bnc #440184 + y2milestone ("Some (%1) sources have been added, storing them...", added_ids); + Pkg::SourceSaveAll(); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0