February 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r55195 - /trunk/qt-graph/src/QY2Graph.h
by aschnell＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: aschnell Date: Mon Feb 2 21:10:09 2009 New Revision: 55195 URL: http://svn.opensuse.org/viewcvs/yast?rev=55195&view=rev Log: - added comment Modified: trunk/qt-graph/src/QY2Graph.h Modified: trunk/qt-graph/src/QY2Graph.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.h?rev=5519… ============================================================================== --- trunk/qt-graph/src/QY2Graph.h (original) +++ trunk/qt-graph/src/QY2Graph.h Mon Feb 2 21:10:09 2009 @@ -30,6 +30,10 @@ #include <QPicture> +/** + * The QY2Graph widget shows a graph layouted by graphviz in a + * QGraphicsView/QGraphicsScene. + */ class QY2Graph : public QGraphicsView { Q_OBJECT -- 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] r55194 - in /trunk/installation: package/yast2-installation.changes src/modules/InstError.ycp
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 16:57:17 2009 New Revision: 55194 URL: http://svn.opensuse.org/viewcvs/yast?rev=55194&view=rev Log: - InstError can now save YaST logs on user request. Modified: trunk/installation/package/yast2-installation.changes trunk/installation/src/modules/InstError.ycp 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 Mon Feb 2 16:57:17 2009 @@ -3,6 +3,7 @@ - Erasing all old additional control files in the final step of upgrade before rebooting to the second stage (bnc #471454). +- InstError can now save YaST logs on user request. - 2.18.4 ------------------------------------------------------------------- Modified: trunk/installation/src/modules/InstError.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/modules/InstErr… ============================================================================== --- trunk/installation/src/modules/InstError.ycp (original) +++ trunk/installation/src/modules/InstError.ycp Mon Feb 2 16:57:17 2009 @@ -16,9 +16,62 @@ import "Icon"; import "Label"; + import "String"; + import "Report"; + + boolean SaveLogs () { + map cmd = (map) WFM::Execute (.local.bash_output, "echo ${HOME}"); + string homedir = "/"; + + if (cmd["exit"]:-1 == 0) { + homedir = splitstring (cmd["stdout"]:"/", "\n")[0]:"/"; + if (homedir == "") homedir = "/"; + } else { + y2warning ("Unable to find out home dir: %1, using %2", cmd, homedir); + } + homedir = sformat ("%1/y2logs.tgz", homedir); + + string savelogsto = (string) UI::AskForSaveFileName ( + homedir, + "*.tgz *.tar.gz *.tar.bz2", + _("Save y2logs to...") + ); + + if (savelogsto == nil) + return nil; + + // Busy message, %1 is replaced with a filename + UI::OpenDialog (`Label (sformat (_("Saving YaST logs to %1..."), savelogsto))); + y2milestone ("Saving YaST logs to: %1", savelogsto); + + cmd = (map) WFM::Execute (.local.bash_output, sformat ("save_y2logs '%1'", String::Quote (savelogsto))); + boolean dialog_ret = nil; + + if (cmd["exit"]:-1 != 0) { + y2error ("Unable to save logs to %1", savelogsto); + + Report::Error (sformat ( + // Error message, %1 is replaced with a filename + // %2 with am error reason (there is a newline between %1 and %2) + _("Unable to save YaST logs to %1 +%2"), + savelogsto, + cmd["stderr"]:"" + )); + + dialog_ret = false; + } else { + y2milestone ("Logs have been saved to: %1", savelogsto); + dialog_ret = true; + } + + UI::CloseDialog(); + + return dialog_ret; + } global void ShowErrorPopUp (string heading, string error_text, string details) { - boolean success = UI::OpenDialog (`VBox ( + boolean success = (boolean) UI::OpenDialog (`VBox ( `Left (`HBox ( `HSquash (`MarginBox (0.5, 0.2, Icon::Error())), `Heading (heading) @@ -67,7 +120,17 @@ return; } - UI::UserInput(); + any uret = nil; + + while (true) { + uret = UI::UserInput(); + + if (uret == `save_y2logs) { + SaveLogs(); + } else { + break; + } + } UI::CloseDialog(); } -- 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] r55193 - in /branches/tmp/lslezak/core: dbus/namespace_service/ liby2dbus/src/
by lslezak＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: lslezak Date: Mon Feb 2 16:30:23 2009 New Revision: 55193 URL: http://svn.opensuse.org/viewcvs/yast?rev=55193&view=rev Log: - DBus service - added PolicyKit checks Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc branches/tmp/lslezak/core/liby2dbus/src/PolKit.h Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.cc Mon Feb 2 16:30:23 2009 @@ -308,3 +308,26 @@ return reply; } + +std::string DBusModulesServer::createActionId(const DBusMsg &msg) +{ + // actionId: <prefix>.<namespace>.<method> + std::string ret("org.opensuse.yast.modules"); + + std::string obj(msg.path()); + + if (!obj.empty() && obj[0] == '/') + { + obj.erase(obj.begin()); + } + + ret += '.' + obj + '.' + msg.method(); + + if (!PolKit::isValidActionID(ret)) + { + ret = PolKit::makeValidActionID(ret); + } + + return ret; +} + Modified: branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/dbus/namespa… ============================================================================== --- branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h (original) +++ branches/tmp/lslezak/core/dbus/namespace_service/DBusModulesServer.h Mon Feb 2 16:30:23 2009 @@ -31,6 +31,11 @@ virtual bool connect(); + protected: + + virtual std::string createActionId(const DBusMsg &msg); + + private: // the wrapped Yast namespaces Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.cc Mon Feb 2 16:30:23 2009 @@ -28,7 +28,8 @@ // std::pair #include <utility> -static bool finish = false; +// use atomic type in signal handler +static sig_atomic_t finish = 0; DBusServerBase::DBusServerBase() { @@ -63,7 +64,7 @@ if (signal == SIGALRM) { // set the finish flag for the main loop - finish = true; + finish = 1; } } @@ -143,7 +144,7 @@ else { // reset the flag - finish = false; + finish = 0; // set a new timer resetTimer(); @@ -273,63 +274,70 @@ } else if (request.type() == DBUS_MESSAGE_TYPE_METHOD_CALL) { - // TODO check the policy - - // find the registered object - std::string objname = request.path(); - - // remove the slash at the beginning - if (objname.size() > 0 && objname[0] == '/') + // check the policy using PolicyKit + if (isActionAllowed(request)) { - objname.erase(objname.begin()); - } + // find the registered object + std::string objname = request.path(); - // search the object - Objects::const_iterator i = registered_objects.find(objname); + // remove the slash at the beginning + if (objname.size() > 0 && objname[0] == '/') + { + objname.erase(objname.begin()); + } - bool found = false; + // search the object + Objects::const_iterator i = registered_objects.find(objname); - if (i != registered_objects.end()) - { - ObjectData::const_iterator ii = i->second.find(request.interface()); + bool found = false; - if (ii != i->second.end()) + if (i != registered_objects.end()) { - InterfaceData::const_iterator iii = ii->second.find(request.method()); + ObjectData::const_iterator ii = i->second.find(request.interface()); - if (iii != ii->second.end()) + if (ii != i->second.end()) { - MethodData md = iii->second; - methodHandler mh = md.first; + InterfaceData::const_iterator iii = ii->second.find(request.method()); + + if (iii != ii->second.end()) + { + MethodData md = iii->second; + methodHandler mh = md.first; - y2milestone("Evaluating method: object %s interface: %s, method: %s", - request.path().c_str(), request.interface().c_str(), request.method().c_str()); + y2milestone("Evaluating method: object %s interface: %s, method: %s", + request.path().c_str(), request.interface().c_str(), request.method().c_str()); - // call the registered callback - found = true; - reply = mh(request); + // call the registered callback + found = true; + reply = mh(request); + } + else + { + y2warning("Object %s does not provide method %s in interface %s", + objname.c_str(), request.path().c_str(), request.interface().c_str()); + } } else { - y2warning("Object %s does not provide method %s in interface %s", - objname.c_str(), request.path().c_str(), request.interface().c_str()); + y2warning("Object %s does not provide interface %s", + objname.c_str(), request.interface().c_str()); } } else { - y2warning("Object %s does not provide interface %s", - objname.c_str(), request.interface().c_str()); + y2warning("Object %s is not registered", objname.c_str()); + } + + if (!found) + { + // report error + reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); } } else { - y2warning("Object %s is not registered", objname.c_str()); - } - - if (!found) - { // report error - reply.createError(request, "Unknown object, interface or method", DBUS_ERROR_UNKNOWN_METHOD); + reply.createError(request, "Access denied, check PolicyKit priviledges", DBUS_ERROR_ACCESS_DENIED); } } else if (request.type() == DBUS_MESSAGE_TYPE_ERROR) @@ -349,7 +357,7 @@ else if (request.type() == DBUS_MESSAGE_TYPE_SIGNAL) { // singals are not supported - y2error("Received a signal: interface: %s method: %s", request.interface().c_str(), request.method().c_str()); + y2warning("Ignoring a received signal: interface: %s method: %s", request.interface().c_str(), request.method().c_str()); } // was a reply set? @@ -362,9 +370,9 @@ } else { - y2milestone("Flushing connection..."); + y2debug("Flushing connection..."); connection.flush(); - y2milestone("...done"); + y2debug("...done"); } } @@ -442,21 +450,31 @@ } } } - -/* -#ifdef HAVE_POLKIT -bool DBusServerBase::isActionAllowed(const std::string &caller, const std::string &path, const std::string &method, - const std::string &arg, const std::string &opt) + +bool DBusServerBase::isActionAllowed(const DBusMsg &msg) { +#ifdef HAVE_POLKIT // create actionId - static const char *polkit_prefix = "org.opensuse.yast.scr"; - std::string action_id(PolKit::createActionId(polkit_prefix, path, method, arg, opt)); + std::string action_id(createActionId(msg)); + y2debug("PolicyKit check: action %s from %s", action_id.c_str(), msg.sender().c_str()); bool ret = false; + if (action_id.empty()) + { + // no actionId -> return the default (forbidden) + return ret; + } + + if (!PolKit::isValidActionID(action_id)) + { + y2error("Invalid action ID: %s", action_id.c_str()); + return ret; + } + // check the policy here - if (policykit.isDBusUserAuthorized(action_id, caller, connection.getConnection())) + if (policykit.isDBusUserAuthorized(action_id, msg.sender(), connection.getConnection())) { y2security("User is authorized to do action %s", action_id.c_str()); ret = true; @@ -467,13 +485,15 @@ } return ret; -} +#else + // no PolicyKit -> enable action + return true; #endif -*/ - +} std::string DBusServerBase::createActionId(const DBusMsg &msg) { - //TODO FIXME + // default implementation is empty string + // the inherited classes should redefine it return std::string(); } Modified: branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/DBusServerBase.h Mon Feb 2 16:30:23 2009 @@ -70,6 +70,7 @@ void resetTimer(); void registerSignalHandler(); bool canFinish(); + bool isActionAllowed(const DBusMsg &msg); typedef std::pair<methodHandler, DBusSignature> MethodData; typedef std::map<Method, MethodData> InterfaceData; Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.cc Mon Feb 2 16:30:23 2009 @@ -65,7 +65,7 @@ return pk_result == POLKIT_RESULT_YES; } -std::string makeValidActionID(const std::string &s) +std::string PolKit::makeValidActionID(const std::string &s) { if (s.empty()) return s; @@ -128,3 +128,9 @@ return action_id; } + +bool PolKit::isValidActionID(const std::string &action) +{ + return polkit_action_validate_id(action.c_str()); +} + Modified: branches/tmp/lslezak/core/liby2dbus/src/PolKit.h URL: http://svn.opensuse.org/viewcvs/yast/branches/tmp/lslezak/core/liby2dbus/sr… ============================================================================== --- branches/tmp/lslezak/core/liby2dbus/src/PolKit.h (original) +++ branches/tmp/lslezak/core/liby2dbus/src/PolKit.h Mon Feb 2 16:30:23 2009 @@ -25,6 +25,10 @@ const std::string &method, const std::string &arg = std::string(), const std::string &opt = std::string()); + static std::string makeValidActionID(const std::string &s); + + static bool isValidActionID(const std::string &action); + private: DBusError dbus_error; -- 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] r55192 - /trunk/network/package/yast2-network.changes
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:13:21 2009 New Revision: 55192 URL: http://svn.opensuse.org/viewcvs/yast?rev=55192&view=rev Log: something for changelog Modified: trunk/network/package/yast2-network.changes Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Mon Feb 2 15:13:21 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Feb 2 15:11:27 CET 2009 - kmachalkova(a)suse.cz + +- Read/write Host::write_hostname variable by Host module only, + override in inst_hostname if applicable (bnc#469752) + +------------------------------------------------------------------- Thu Jan 29 11:59:48 CET 2009 - kmachalkova(a)suse.cz - Proxy finish popup is back - notify user about the need to relogin -- 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] r55191 - /tags/branch-Code-11-2_17_67/network/
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:04:44 2009 New Revision: 55191 URL: http://svn.opensuse.org/viewcvs/yast?rev=55191&view=rev Log: Created tag branch-Code-11-2_17_67 for network Added: tags/branch-Code-11-2_17_67/network/ - copied from r55190, branches/SuSE-Code-11-Branch/network/ -- 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] r55190 - in /branches/SuSE-Code-11-Branch/network: VERSION package/yast2-network.changes src/installation/inst_hostname.ycp src/modules/DNS.ycp src/modules/Host.ycp src/services/dns.ycp
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 15:04:37 2009 New Revision: 55190 URL: http://svn.opensuse.org/viewcvs/yast?rev=55190&view=rev Log: Read/write Host::write_hostname variable by Host module only, override in inst_hostname if applicable (bnc#469752) Modified: branches/SuSE-Code-11-Branch/network/VERSION branches/SuSE-Code-11-Branch/network/package/yast2-network.changes branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp branches/SuSE-Code-11-Branch/network/src/services/dns.ycp Modified: branches/SuSE-Code-11-Branch/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/V… ============================================================================== --- branches/SuSE-Code-11-Branch/network/VERSION (original) +++ branches/SuSE-Code-11-Branch/network/VERSION Mon Feb 2 15:04:37 2009 @@ -1 +1 @@ -2.17.66 +2.17.67 Modified: branches/SuSE-Code-11-Branch/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/p… ============================================================================== --- branches/SuSE-Code-11-Branch/network/package/yast2-network.changes (original) +++ branches/SuSE-Code-11-Branch/network/package/yast2-network.changes Mon Feb 2 15:04:37 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Feb 2 15:02:08 CET 2009 - kmachalkova(a)suse.cz + +- Read/write Host::write_hostname variable by Host module only, + override in inst_hostname if applicable (bnc#469752) +- 2.17.67 + +------------------------------------------------------------------- Wed Jan 21 09:38:33 CET 2009 - mzugec(a)suse.cz - fix mailformed NAME in ifcfg file when setup network via Linuxrc Modified: branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/installation/inst_hostname.ycp Mon Feb 2 15:04:37 2009 @@ -31,9 +31,6 @@ // FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); y2milestone("write_hostname_to_hosts value from control.xml : %1", whth); -SCR::Write(.sysconfig.network.dhcp."WRITE_HOSTNAME_TO_HOSTS", whth ? "yes" : "no"); -SCR::Write(.sysconfig.network.dhcp, nil); - DNS::Read (); // handles NetworkConfig too @@ -45,6 +42,8 @@ // propose settings NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop (); +// override with setting from control.xml +Host::SetWriteHostname( whth ); // TODO: policy for proposing a hostname symbol ret = `next; Modified: branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/DNS.ycp Mon Feb 2 15:04:37 2009 @@ -125,8 +125,12 @@ if(initialized == true) return true; - Host::Read(); + //in this order, because Host:;write hostname gets initialized from NetworkConfig::DHCP NetworkConfig::Read(); + Host::Read(); + + Host::SetWriteHostname( NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ); + y2milestone("write_hostname_to_hosts value from sysconfig : %1", NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true); /* install.inf from linuxrc */ map install_inf = $[]; @@ -208,18 +212,16 @@ //are defined for each static IP separately in address dialog //FaTE #2202 - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) - Host::write_hostname=false; - else - { + if (Host::WriteHostname()) { //Always add 127.0.0.2 entry to /etc/hosts, otherwise some //desktop apps may hang, not being able to resolve hostname (#304632) //empty list [] as third parameter does that - Host::Update(oldhostname, fqhostname, []); + Host::Update(oldhostname, fqhostname, []); Host::Write(); } oldhostname = fqhostname; // #49634 + NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname(); NetworkConfig::Write(); y2milestone("Writing configuration"); Modified: branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/modules/Host.ycp Mon Feb 2 15:04:37 2009 @@ -13,6 +13,7 @@ textdomain "network"; import "Hostname"; +import "NetworkConfig"; import "String"; import "Summary"; @@ -31,7 +32,10 @@ */ global boolean modified = false; -global boolean write_hostname = true; +/** + * Should static hostname be written to /etc/hosts? + */ +boolean write_hostname = true; /** * All hosts read at the start @@ -50,6 +54,16 @@ boolean initialized = false; +global boolean WriteHostname() +{ + return write_hostname; +} + +global void SetWriteHostname( boolean w) +{ + write_hostname = w; +} + /** * Read hosts settings * @return true if success @@ -83,6 +97,7 @@ global define boolean Write() { y2milestone("Writing configuration"); + if(!modified) { y2milestone("No changes to Host -> nothing to write"); return true; @@ -94,7 +109,6 @@ return true; } - list <string> steps = [ _("Update /etc/hosts"), ]; Modified: branches/SuSE-Code-11-Branch/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/network/s… ============================================================================== --- branches/SuSE-Code-11-Branch/network/src/services/dns.ycp (original) +++ branches/SuSE-Code-11-Branch/network/src/services/dns.ycp Mon Feb 2 15:04:37 2009 @@ -15,6 +15,7 @@ import "CWM"; import "DNS"; import "GetInstArgs"; +import "Host"; import "Hostname"; import "IP"; import "Label"; @@ -70,7 +71,7 @@ "DOMAIN": DNS::domain, "DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false, // set as true by default because there wasn't this option in previous version - "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true + "WRITE_HOSTNAME": Host::WriteHostname() ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -108,7 +109,7 @@ DNS::nameservers = NonEmpty (nameservers); DNS::searchlist = NonEmpty (searchlist); NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; - NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true; + Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true ); /* update modified flag */ DNS::modified = 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] r55189 - in /trunk/network/src: installation/inst_hostname.ycp modules/DNS.ycp modules/Host.ycp services/dns.ycp
by kmachalkova＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: kmachalkova Date: Mon Feb 2 14:58:15 2009 New Revision: 55189 URL: http://svn.opensuse.org/viewcvs/yast?rev=55189&view=rev Log: Read/write Host::write_hostname variable by Host module only, override in inst_hostname if applicable (bnc#469752) Modified: trunk/network/src/installation/inst_hostname.ycp trunk/network/src/modules/DNS.ycp trunk/network/src/modules/Host.ycp trunk/network/src/services/dns.ycp Modified: trunk/network/src/installation/inst_hostname.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/installation/inst_ho… ============================================================================== --- trunk/network/src/installation/inst_hostname.ycp (original) +++ trunk/network/src/installation/inst_hostname.ycp Mon Feb 2 14:58:15 2009 @@ -31,9 +31,6 @@ // FaTe#303875: Introduce a switch regarding 127.0.0.2 entry in /etc/hosts boolean whth = ProductFeatures::GetBooleanFeature ("globals", "write_hostname_to_hosts"); y2milestone("write_hostname_to_hosts value from control.xml : %1", whth); -SCR::Write(.sysconfig.network.dhcp."WRITE_HOSTNAME_TO_HOSTS", whth ? "yes" : "no"); -SCR::Write(.sysconfig.network.dhcp, nil); - DNS::Read (); // handles NetworkConfig too @@ -45,6 +42,8 @@ // propose settings NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = ! Arch::is_laptop (); +// override with setting from control.xml +Host::SetWriteHostname( whth ); // TODO: policy for proposing a hostname symbol ret = `next; Modified: trunk/network/src/modules/DNS.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/DNS.ycp?rev=… ============================================================================== --- trunk/network/src/modules/DNS.ycp (original) +++ trunk/network/src/modules/DNS.ycp Mon Feb 2 14:58:15 2009 @@ -125,8 +125,12 @@ if(initialized == true) return true; - Host::Read(); + //in this order, because Host:;write hostname gets initialized from NetworkConfig::DHCP NetworkConfig::Read(); + Host::Read(); + + Host::SetWriteHostname( NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true ); + y2milestone("write_hostname_to_hosts value from sysconfig : %1", NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true); /* install.inf from linuxrc */ map install_inf = $[]; @@ -208,18 +212,16 @@ //are defined for each static IP separately in address dialog //FaTE #2202 - if (NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true == false) - Host::write_hostname=false; - else - { + if (Host::WriteHostname()) { //Always add 127.0.0.2 entry to /etc/hosts, otherwise some //desktop apps may hang, not being able to resolve hostname (#304632) //empty list [] as third parameter does that - Host::Update(oldhostname, fqhostname, []); + Host::Update(oldhostname, fqhostname, []); Host::Write(); } oldhostname = fqhostname; // #49634 + NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = Host::WriteHostname(); NetworkConfig::Write(); y2milestone("Writing configuration"); Modified: trunk/network/src/modules/Host.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/modules/Host.ycp?rev… ============================================================================== --- trunk/network/src/modules/Host.ycp (original) +++ trunk/network/src/modules/Host.ycp Mon Feb 2 14:58:15 2009 @@ -13,6 +13,7 @@ textdomain "network"; import "Hostname"; +import "NetworkConfig"; import "String"; import "Summary"; @@ -31,7 +32,10 @@ */ global boolean modified = false; -global boolean write_hostname = true; +/** + * Should static hostname be written to /etc/hosts? + */ +boolean write_hostname = true; /** * All hosts read at the start @@ -50,6 +54,16 @@ boolean initialized = false; +global boolean WriteHostname() +{ + return write_hostname; +} + +global void SetWriteHostname( boolean w) +{ + write_hostname = w; +} + /** * Read hosts settings * @return true if success @@ -83,6 +97,7 @@ global define boolean Write() { y2milestone("Writing configuration"); + if(!modified) { y2milestone("No changes to Host -> nothing to write"); return true; @@ -94,7 +109,6 @@ return true; } - list <string> steps = [ _("Update /etc/hosts"), ]; Modified: trunk/network/src/services/dns.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/services/dns.ycp?rev… ============================================================================== --- trunk/network/src/services/dns.ycp (original) +++ trunk/network/src/services/dns.ycp Mon Feb 2 14:58:15 2009 @@ -15,6 +15,7 @@ import "CWM"; import "DNS"; import "GetInstArgs"; +import "Host"; import "Hostname"; import "IP"; import "Label"; @@ -70,7 +71,7 @@ "DOMAIN": DNS::domain, "DHCP_HOSTNAME": NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"]:false, // set as true by default because there wasn't this option in previous version - "WRITE_HOSTNAME": NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"]:true + "WRITE_HOSTNAME": Host::WriteHostname() ]; // the rest is not so straightforward, // because we have list variables but non-list widgets @@ -108,7 +109,7 @@ DNS::nameservers = NonEmpty (nameservers); DNS::searchlist = NonEmpty (searchlist); NetworkConfig::DHCP["DHCLIENT_SET_HOSTNAME"] = settings["DHCP_HOSTNAME"]:false; - NetworkConfig::DHCP["WRITE_HOSTNAME_TO_HOSTS"] = settings["WRITE_HOSTNAME"]:true; + Host::SetWriteHostname( settings["WRITE_HOSTNAME"]:true ); /* update modified flag */ DNS::modified = 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] r55188 - /tags/stable-2_18_2/add-on/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:53:28 2009 New Revision: 55188 URL: http://svn.opensuse.org/viewcvs/yast?rev=55188&view=rev Log: Created tag stable-2_18_2 for add-on Added: tags/stable-2_18_2/add-on/ - copied from r55187, trunk/add-on/ -- 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] r55187 - in /trunk/qt-graph: examples/colors.dot src/QY2Graph.cc
by aschnell＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: aschnell Date: Mon Feb 2 14:49:37 2009 New Revision: 55187 URL: http://svn.opensuse.org/viewcvs/yast?rev=55187&view=rev Log: - support background color Modified: trunk/qt-graph/examples/colors.dot trunk/qt-graph/src/QY2Graph.cc Modified: trunk/qt-graph/examples/colors.dot URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/examples/colors.dot?rev… ============================================================================== --- trunk/qt-graph/examples/colors.dot (original) +++ trunk/qt-graph/examples/colors.dot Mon Feb 2 14:49:37 2009 @@ -1,5 +1,6 @@ digraph { + graph [bgcolor="#eeeeff"]; node [style="filled"]; A; Modified: trunk/qt-graph/src/QY2Graph.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt-graph/src/QY2Graph.cc?rev=551… ============================================================================== --- trunk/qt-graph/src/QY2Graph.cc (original) +++ trunk/qt-graph/src/QY2Graph.cc Mon Feb 2 14:49:37 2009 @@ -328,6 +328,8 @@ scene->setSceneRect(rect.adjusted(-5, -5, +5, +5)); size = rect.size(); + scene->setBackgroundBrush(aggetToQColor(graph, "bgcolor", Qt::white)); + for (node_t* node = agfstnode(graph); node != NULL; node = agnxtnode(graph, node)) { QPicture picture; -- 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] r55186 - /tags/branch-Code-11-2_17_17/add-on/
by locilka＠svn.opensuse.org 02 Feb '09

02 Feb '09

Author: locilka Date: Mon Feb 2 14:44:16 2009 New Revision: 55186 URL: http://svn.opensuse.org/viewcvs/yast?rev=55186&view=rev Log: Created tag branch-Code-11-2_17_17 for add-on Added: tags/branch-Code-11-2_17_17/add-on/ - copied from r55185, branches/SuSE-Code-11-Branch/add-on/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0