September 2007 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r40757 - in /trunk/squid/src: complex.ycp dialogs.ycp helper_functions.ycp popup_dialogs.ycp
by dfiser＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: dfiser Date: Wed Sep 5 11:41:18 2007 New Revision: 40757 URL: http://svn.opensuse.org/viewcvs/yast?rev=40757&view=rev Log: Changed order of Add, Edit, Del buttons in all widgets. All checkboxs aligned to left. Start-Up dialog aligned to top. All Up and Down buttons aligned to top. Modified: trunk/squid/src/complex.ycp trunk/squid/src/dialogs.ycp trunk/squid/src/helper_functions.ycp trunk/squid/src/popup_dialogs.ycp Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40757&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Wed Sep 5 11:41:18 2007 @@ -196,11 +196,11 @@ "widget_names" : ["auto_start", "start_stop"], "contents" : `HBox( `HSpacing(3), - `VBox( + `Top(`VBox( "auto_start", `VSpacing(), (Mode::normal() ? "start_stop" : `Empty()) - ), + )), `HSpacing(3) ), "caption" : main_caption + ": " + _("Start-Up"), Modified: trunk/squid/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/dialogs.ycp?rev=40757&… ============================================================================== --- trunk/squid/src/dialogs.ycp (original) +++ trunk/squid/src/dialogs.ycp Wed Sep 5 11:41:18 2007 @@ -43,8 +43,8 @@ `Table(`id("http_port"), `opt(`notify), `header(_("Host"), _("Port"), _("Options"))), `HBox( `PushButton(`id(`add), Label::AddButton()), - `PushButton(`id(`del), Label::DeleteButton()), `PushButton(`id(`edit), Label::EditButton()), + `PushButton(`id(`del), Label::DeleteButton()), `HStretch() ) ); @@ -58,15 +58,15 @@ `HBox( `Table(`id("refresh_patterns"), `opt(`keepSorting, `notify), `header(_("Regular Expression"), _("Min"), _("Precent"), _("Max")/*, _("Options")*/)), - `VBox( + `Top(`VBox( `PushButton(`id(`up), Label::UpButton()), `PushButton(`id(`down), Label::DownButton()) - ) + )) ), `HBox( `PushButton(`id(`add), Label::AddButton()), - `PushButton(`id(`del), Label::DeleteButton()), `PushButton(`id(`edit), Label::EditButton()), + `PushButton(`id(`del), Label::DeleteButton()), `HStretch() ) ); @@ -152,8 +152,8 @@ `Table(`id("acl"), `opt(`notify), `header(_("Name"), _("Type"), _("Description"))), `HBox( `PushButton(`id(`add_acl), Label::AddButton()), - `PushButton(`id(`del_acl), Label::DeleteButton()), `PushButton(`id(`edit_acl), Label::EditButton()), + `PushButton(`id(`del_acl), Label::DeleteButton()), `HStretch() ) ); @@ -166,15 +166,15 @@ `Left(`Label(_("Access Control"))), `HBox( `Table(`id("http_access"), `opt(`keepSorting, `notify), `header(_("Allow/Deny"), _("ACL Groups"))), - `HSquash(`VBox( + `HSquash(`Top(`VBox( `HWeight(1, `PushButton(`id(`up_http_access), Label::UpButton())), `HWeight(1, `PushButton(`id(`down_http_access), Label::DownButton())) - )) + ))) ), `HBox( `PushButton(`id(`add_http_access), Label::AddButton()), - `PushButton(`id(`del_http_access), Label::DeleteButton()), `PushButton(`id(`edit_http_access), Label::EditButton()), + `PushButton(`id(`del_http_access), Label::DeleteButton()), `HStretch() ) ); @@ -230,7 +230,7 @@ `VSpacing(), `TextEntry(`id("cache_mgr"), _("&Administrator's e-mail"), ""), `VSpacing(), - `CheckBox(`id("ftp_passive"), _("&Use Ftp Pasive Mode")) + `Left(`CheckBox(`id("ftp_passive"), _("&Use Ftp Passive Mode"))) ))); } Modified: trunk/squid/src/helper_functions.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/helper_functions.ycp?r… ============================================================================== --- trunk/squid/src/helper_functions.ycp (original) +++ trunk/squid/src/helper_functions.ycp Wed Sep 5 11:41:18 2007 @@ -37,7 +37,7 @@ */ term sizeUnitWidget(string id) { - return `ComboBox(`id(id), " ", + return `ComboBox(`id(id), _("&Units"), [`item("KB"), `item("MB")]); } Modified: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=… ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (original) +++ trunk/squid/src/popup_dialogs.ycp Wed Sep 5 11:41:18 2007 @@ -53,9 +53,7 @@ `VSpacing(0.5), `TextEntry(`id("host"), _("Host"), ""), `TextEntry(`id("port"), _("Port"), ""), - `Frame(_("Options"), - `CheckBox(`id("transparent"), "Transparent", false) - ), + `Left(`CheckBox(`id("transparent"), "Transparent", false)), `VSpacing(), `VStretch(), `HBox( -- 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] r40756 - /trunk/network/src/clients/save_network.ycp
by kmachalkova＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: kmachalkova Date: Wed Sep 5 10:58:59 2007 New Revision: 40756 URL: http://svn.opensuse.org/viewcvs/yast?rev=40756&view=rev Log: Save proxy settings at the end of 1st stage of installation (#298001) Modified: trunk/network/src/clients/save_network.ycp Modified: trunk/network/src/clients/save_network.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/save_network… ============================================================================== --- trunk/network/src/clients/save_network.ycp (original) +++ trunk/network/src/clients/save_network.ycp Wed Sep 5 10:58:59 2007 @@ -18,6 +18,7 @@ import "FileUtils"; import "Netmask"; import "NetworkStorage"; +import "Proxy"; import "Installation"; import "String"; import "Mode"; @@ -82,6 +83,7 @@ ReadInstallInfItem(install_inf, "nisdomain", "NISDomain"); ReadInstallInfItem(install_inf, "hostname", "Hostname"); ReadInstallInfItem(install_inf, "module", "Alias"); + ReadInstallInfItem(install_inf, "proxy", "Proxy"); // ReadInstallInfItem(install_inf, "options", "Options"); ReadInstallInfItem(install_inf, "hwaddr", "HWAddr"); ReadInstallInfItem(install_inf, "ethtool_options", "ethtool"); @@ -267,6 +269,15 @@ SCR::Write(.target.string, "/etc/resolv.conf", text); } } + + // create proxy sysconfig file + if (size(InstallInf["proxy"]:"")>0) { + y2milestone("Writing proxy settings: %1", InstallInf["proxy"]:""); + map ex = Proxy::Export(); + Proxy::Read(); + Proxy::Import( ex ); + Proxy::Write(); + } // create defaultdomain if (size(InstallInf["nisdomain"]:"")>0 && FileUtils::Exists("/etc/defaultdomain")){ y2milestone("Write defaultdomain: %1", InstallInf["nisdomain"]:""); -- 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] r40755 - /trunk/network/src/installation/inst_do_net_test.ycp
by kmachalkova＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: kmachalkova Date: Wed Sep 5 10:55:39 2007 New Revision: 40755 URL: http://svn.opensuse.org/viewcvs/yast?rev=40755&view=rev Log: Fix downloading release notes with proxy (#305222) Modified: trunk/network/src/installation/inst_do_net_test.ycp Modified: trunk/network/src/installation/inst_do_net_test.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_do… ============================================================================== --- trunk/network/src/installation/inst_do_net_test.ycp (original) +++ trunk/network/src/installation/inst_do_net_test.ycp Wed Sep 5 10:55:39 2007 @@ -371,7 +371,7 @@ } //Include also proxy option (if applicable) - #162800, #260407 - string cmd = " /usr/bin/curl -s -S -v -f -m 300" + proxy + " " + url + " -o " + filename; + string cmd = " /usr/bin/curl -s -S -v -f -m 300 " + proxy + " " + url + " -o " + filename; cmd = cmd + " > " + logdir + "/" + log_filename + " 2>&1"; // env["LANG"] = GetLanguageUTF8 (); -- 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] r40754 - in /trunk/network/testsuite/tests: Proxy.out Proxy.ycp
by kmachalkova＠svn.opensuse.org 05 Sep '07

05 Sep '07

Author: kmachalkova Date: Wed Sep 5 10:47:37 2007 New Revision: 40754 URL: http://svn.opensuse.org/viewcvs/yast?rev=40754&view=rev Log: Proxy testsuite adjusted to correct .curlrc syntax Modified: trunk/network/testsuite/tests/Proxy.out trunk/network/testsuite/tests/Proxy.ycp Modified: trunk/network/testsuite/tests/Proxy.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Proxy.ou… ============================================================================== --- trunk/network/testsuite/tests/Proxy.out (original) +++ trunk/network/testsuite/tests/Proxy.out Wed Sep 5 10:47:37 2007 @@ -6,9 +6,9 @@ Read .sysconfig.proxy.NO_PROXY nil Read .sysconfig.proxy.PROXY_ENABLED nil Read .target.size "/root/.curlrc" 1 -Read .root.curlrc."--proxy-user" nil +Read .root.curlrc."--proxy-user" "user:pass" Return true Dump Write Dump Import Dump Export -Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"", "proxy_user":""] +Return $["enabled":true, "ftp_proxy":"f", "http_proxy":"h", "https_proxy":"h", "no_proxy":"", "proxy_password":"pass", "proxy_user":"user"] Modified: trunk/network/testsuite/tests/Proxy.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/testsuite/tests/Proxy.yc… ============================================================================== --- trunk/network/testsuite/tests/Proxy.ycp (original) +++ trunk/network/testsuite/tests/Proxy.ycp Wed Sep 5 10:47:37 2007 @@ -5,7 +5,7 @@ map READ = $[ "root" : $[ "curlrc" : $[ - "proxy-user" : "user:pass", + "--proxy-user" : "user:pass", ], ], "sysconfig" : $[ -- 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] r40753 - in /trunk/storage: libstorage/src/EtcFstab.h libstorage/src/Volume.cc package/yast2-storage.changes
by fehr＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: fehr Date: Tue Sep 4 16:57:47 2007 New Revision: 40753 URL: http://svn.opensuse.org/viewcvs/yast?rev=40753&view=rev Log: - fix problem with resizing encrypted volumes (#307219) - fix missing initialisation of tmpcrypt (#307219) - fix possible usage of nonzero passno for encrypted fstab entries (#296409) Modified: trunk/storage/libstorage/src/EtcFstab.h trunk/storage/libstorage/src/Volume.cc trunk/storage/package/yast2-storage.changes Modified: trunk/storage/libstorage/src/EtcFstab.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/EtcFstab.… ============================================================================== --- trunk/storage/libstorage/src/EtcFstab.h (original) +++ trunk/storage/libstorage/src/EtcFstab.h Tue Sep 4 16:57:47 2007 @@ -16,7 +16,8 @@ struct FstabEntry { - FstabEntry() { freq=passno=0; crypto=cryptt=loop=noauto=dmcrypt=false; + FstabEntry() { freq=passno=0; + crypto=cryptt=loop=noauto=dmcrypt=tmpcrypt=false; encr=storage::ENC_NONE; mount_by=storage::MOUNTBY_DEVICE; } FstabEntry& operator=( const FstabChange& rhs ); friend std::ostream& operator<< (std::ostream& s, const FstabEntry &v ); Modified: trunk/storage/libstorage/src/Volume.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/libstorage/src/Volume.cc… ============================================================================== --- trunk/storage/libstorage/src/Volume.cc (original) +++ trunk/storage/libstorage/src/Volume.cc Tue Sep 4 16:57:47 2007 @@ -1168,11 +1168,17 @@ int Volume::resizeFs() { + SystemCmd c; + string cmd; int ret = 0; + if( encryption!=ENC_NONE && !dmcrypt_dev.empty() ) + { + cmd = "cryptsetup resize "; + cmd += dmcrypt_dev.substr(dmcrypt_dev.rfind( '/' )+1); + c.execute( cmd ); + } if( !format && !ignore_fs ) { - string cmd; - SystemCmd c; switch( fs ) { case SWAP: @@ -2396,7 +2402,7 @@ { changed = true; che.fs = fs_names[fs]; - if( fs==SWAP || fs==NFS ) + if( fs==SWAP || fs==NFS || encryption!=ENC_NONE ) che.freq = che.passno = 0; else { Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Tue Sep 4 16:57:47 2007 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Sep 4 16:55:55 CEST 2007 - fehr(a)suse.de + +- fix problem with resizing encrypted volumes (#307219) +- fix missing initialisation of tmpcrypt (#307219) +- fix possible usage of nonzero passno for encrypted fstab entries + (#296409) + +------------------------------------------------------------------- Mon Sep 3 11:34:26 CEST 2007 - fehr(a)suse.de - call insserv or insser -r for boot.{md,lvm,dmraid} as needed (#303857) -- 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] r40752 - /trunk/squid/src/popup_dialogs.ycp
by dfiser＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: dfiser Date: Tue Sep 4 16:07:43 2007 New Revision: 40752 URL: http://svn.opensuse.org/viewcvs/yast?rev=40752&view=rev Log: Swapped OK and Cancel button in all popup dialogs. Modified: trunk/squid/src/popup_dialogs.ycp Modified: trunk/squid/src/popup_dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/popup_dialogs.ycp?rev=… ============================================================================== --- trunk/squid/src/popup_dialogs.ycp (original) +++ trunk/squid/src/popup_dialogs.ycp Tue Sep 4 16:07:43 2007 @@ -59,8 +59,8 @@ `VSpacing(), `VStretch(), `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) + `PushButton(`id(`ok), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ); @@ -116,8 +116,8 @@ `VStretch(), `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) + `PushButton(`id(`ok), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ); @@ -228,8 +228,8 @@ `VStretch(), `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) + `PushButton(`id(`ok), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) ); @@ -300,8 +300,8 @@ `VStretch(), `HBox( - `PushButton(`id(`cancel), Label::CancelButton()), - `PushButton(`id(`ok), Label::OKButton()) + `PushButton(`id(`ok), Label::OKButton()), + `PushButton(`id(`cancel), Label::CancelButton()) ) )) ); -- 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] r40751 - /tags/stable-2_15_3/squid/
by dfiser＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: dfiser Date: Tue Sep 4 15:50:53 2007 New Revision: 40751 URL: http://svn.opensuse.org/viewcvs/yast?rev=40751&view=rev Log: Created tag stable-2_15_3 for squid Added: tags/stable-2_15_3/squid/ - copied from r40750, trunk/squid/ -- 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] r40750 - in /trunk/squid: VERSION package/yast2-squid.changes
by dfiser＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: dfiser Date: Tue Sep 4 15:50:29 2007 New Revision: 40750 URL: http://svn.opensuse.org/viewcvs/yast?rev=40750&view=rev Log: v2.15.3 Modified: trunk/squid/VERSION trunk/squid/package/yast2-squid.changes Modified: trunk/squid/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/VERSION?rev=40750&r1=40749… ============================================================================== --- trunk/squid/VERSION (original) +++ trunk/squid/VERSION Tue Sep 4 15:50:29 2007 @@ -1 +1 @@ -2.15.2 +2.15.3 Modified: trunk/squid/package/yast2-squid.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/package/yast2-squid.change… ============================================================================== --- trunk/squid/package/yast2-squid.changes (original) +++ trunk/squid/package/yast2-squid.changes Tue Sep 4 15:50:29 2007 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Sep 4 15:37:38 CEST 2007 - dfiser(a)suse.cz + +- Added .rnc schema file (bug #304267). +- Removed some checks of local system if module is running as + autoyast client. In autoyast, Squid module is filled with default + values. (bug #304264) +- v2.15.3 + +------------------------------------------------------------------- Tue Aug 28 15:22:39 CEST 2007 - dfiser(a)suse.cz - Added checking of more input data (bug #304314). -- 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] r40749 - in /trunk/squid: src/Squid.ycp src/complex.ycp src/squid.desktop src/squid.rnc src/squid_auto.ycp yast2-squid.spec.in
by dfiser＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: dfiser Date: Tue Sep 4 15:37:25 2007 New Revision: 40749 URL: http://svn.opensuse.org/viewcvs/yast?rev=40749&view=rev Log: .rnc file is verified - added some comments how to verify it later. squid.desktop and yast2-squid.spec.in modified beacause of new .rnc file. Modified summary displayed in autoyast and some little modifications in autoyast client. Modified: trunk/squid/src/Squid.ycp trunk/squid/src/complex.ycp trunk/squid/src/squid.desktop trunk/squid/src/squid.rnc trunk/squid/src/squid_auto.ycp trunk/squid/yast2-squid.spec.in Modified: trunk/squid/src/Squid.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/Squid.ycp?rev=40749&r1… ============================================================================== --- trunk/squid/src/Squid.ycp (original) +++ trunk/squid/src/Squid.ycp Tue Sep 4 15:37:25 2007 @@ -132,7 +132,7 @@ "emulate_httpd_log" : ["off"], "connect_timeout" : ["2", "minutes"], - "client_lifetime" : ["1", "day"], + "client_lifetime" : ["1", "days"], "error_directory" : ["/usr/share/squid/errors/English"], "cache_mgr" : ["webmaster"], @@ -381,6 +381,7 @@ global void SetServiceEnabled(boolean enabled) { + SetModified(); service_enabled_on_startup = enabled; } /******* SERVICE END **/ @@ -1398,19 +1399,30 @@ if (!GetModified()){ summary = Summary::NotConfigured(); }else{ + // Header summary = Summary::AddHeader("", _("Squid Cache Proxy")); + + // Start daemon + summary = Summary::AddLine(summary, _("Start daemon: ") + + "" + (service_enabled_on_startup ? _("When booting") : _("Manually")) + ""); + + // Http Ports summary = Summary::AddLine(summary, _("Configured ports:")); if (size(http_ports) > 0){ summary = Summary::OpenList(summary); foreach (map<string,any> value, http_ports, { - tmp = ""; - if (size(value["host"]:"") > 0) tmp = value["host"]:"" + ":"; - tmp = tmp + value["port"]:""; + tmp = ""; + if (size(value["host"]:"") > 0) tmp = tmp + value["host"]:"" + ":"; + tmp = tmp + value["port"]:"" + (value["transparent"]:false ? _(" (transparent)") : ""); + tmp = tmp + ""; summary = Summary::AddListItem(summary, tmp); }); summary = Summary::CloseList(summary); } + + //Cache directory + summary = Summary::AddLine(summary, _("Cache directory: ") + "" + (settings["cache_dir"]:[])[1]:"" + ""); } return [ summary, [] ]; } Modified: trunk/squid/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/complex.ycp?rev=40749&… ============================================================================== --- trunk/squid/src/complex.ycp (original) +++ trunk/squid/src/complex.ycp Tue Sep 4 15:37:25 2007 @@ -198,6 +198,7 @@ `HSpacing(3), `VBox( "auto_start", + `VSpacing(), (Mode::normal() ? "start_stop" : `Empty()) ), `HSpacing(3) Modified: trunk/squid/src/squid.desktop URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.desktop?rev=4074… ============================================================================== --- trunk/squid/src/squid.desktop (original) +++ trunk/squid/src/squid.desktop Tue Sep 4 15:37:25 2007 @@ -15,6 +15,7 @@ X-SuSE-YaST-Geometry= X-SuSE-YaST-SortKey= X-SuSE-YaST-AutoInstResource=squid +X-SuSE-YaST-AutoInstSchema=squid.rnc Icon=yast-squid Exec=/sbin/yast2 squid Modified: trunk/squid/src/squid.rnc URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid.rnc?rev=40749&r1… ============================================================================== --- trunk/squid/src/squid.rnc (original) +++ trunk/squid/src/squid.rnc Tue Sep 4 15:37:25 2007 @@ -1,3 +1,15 @@ +default namespace = "http://www.suse.com/1.0/yast2ns" +namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0" +namespace config = "http://www.suse.com/1.0/configns" + + +# for testing: +# call 'trang squid.rnc squid.rng' to generate .rng file +# call '/usr/bin/xmllint --noout --relaxng /path/to/squid.rng /path/to/xml' to +# verify correctness of .rnc +#start = element profile { squid } +#include '/usr/share/YaST2/schema/autoyast/rnc/common.rnc' + squid = element squid{ element acls{ LIST, @@ -39,7 +51,6 @@ }* }? & element settings{ - LIST, element access_log{ LIST, element listentry{ text }* @@ -76,7 +87,7 @@ LIST, element listentry{ text }* }? & - element clien_lifetime{ + element client_lifetime{ LIST, element listentry{ text }* }? & Modified: trunk/squid/src/squid_auto.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/src/squid_auto.ycp?rev=407… ============================================================================== --- trunk/squid/src/squid_auto.ycp (original) +++ trunk/squid/src/squid_auto.ycp Tue Sep 4 15:37:25 2007 @@ -77,6 +77,9 @@ /* Change configuration (run AutoSequence) */ else if (func == "Change") { ret = SquidAutoSequence(); + if (ret != `abort && ret != `cancel){ + Squid::SetModified(); + } } /* Import configuration */ else if (func == "Import") { Modified: trunk/squid/yast2-squid.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/squid/yast2-squid.spec.in?rev=40… ============================================================================== --- trunk/squid/yast2-squid.spec.in (original) +++ trunk/squid/yast2-squid.spec.in Tue Sep 4 15:37:25 2007 @@ -29,5 +29,6 @@ @moduledir@/SquidACL.* @moduledir@/SquidErrorMessages.* @desktopdir@/squid.desktop +@schemadir@/autoyast/rnc/squid.rnc @scrconfdir@/*.scr %doc @docdir@ -- 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] r40748 - /tags/stable-2_15_73/network/
by mzugec＠svn.opensuse.org 04 Sep '07

04 Sep '07

Author: mzugec Date: Tue Sep 4 15:16:14 2007 New Revision: 40748 URL: http://svn.opensuse.org/viewcvs/yast?rev=40748&view=rev Log: Created tag stable-2_15_73 for network Added: tags/stable-2_15_73/network/ - copied from r40747, trunk/network/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0