Branch: refs/heads/testing Home: https://github.com/openSUSE/wicked Commit: 980cae3f198a0a837d047b0eeabf86c1707a908e https://github.com/openSUSE/wicked/commit/980cae3f198a0a837d047b0eeabf86c170... Author: Olaf Kirch Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M etc/common.xml.in M src/config.c Log Message: ----------- Small clean-up of config file syntax: group dbus related options together Old-school: <dbus name="org.opensuse.Network" /> <schema name="/some/path/wicked.xml" /> New school: <dbus> <service name="org.opensuse.Network" /> <schema name="/some/path/wicked.xml" /> </dbus> For the time being, both old-school and new-school options will be recognized. No warnings are issued. Signed-off-by: Olaf Kirch Commit: af7cbe66abadda2956f6e6f20ce27b3d6e593aa7 https://github.com/openSUSE/wicked/commit/af7cbe66abadda2956f6e6f20ce27b3d6e... Author: Olaf Kirch Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M etc/common.xml.in M src/config.c Log Message: ----------- config: support a local.xml to override settings w/o getting in trouble with maintenance updates If a user modifies one of the wicked xml config files, we're running into trouble on the next maintenance update. Either the poor guy/gal is using all modifications, or we're not applying our change. One way around that is to have a dangling <include> element in common.xml: <!-- If you want to override configuration options in this file, consider putting them into local.xml rather than here. --> <include name="local.xml" optional="true"/> We don't ship that local.xml. If it doesn't exist, we don't complain, but if the user does create it, we parse it like any other config file. Signed-off-by: Olaf Kirch Commit: 7bae7b3dca64218fb841249297cfff0eb9852490 https://github.com/openSUSE/wicked/commit/7bae7b3dca64218fb841249297cfff0eb9... Author: Olaf Kirch Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M src/config.c Log Message: ----------- Minor cosmetic error logging fix to ni_config_parse_addrconf_* Several ni_error() calls were referring to an XML element by Commit: 375bacf9e243b7f4b1195cb0ee9df4967e0b2bd4 https://github.com/openSUSE/wicked/commit/375bacf9e243b7f4b1195cb0ee9df4967e... Author: Olaf Kirch Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M man/wicked-config.5.in Log Message: ----------- Updated wicked-config.5 manpage Signed-off-by: Olaf Kirch Commit: 17834b24881282dfd174ebbafe75e197fbd7c07d https://github.com/openSUSE/wicked/commit/17834b24881282dfd174ebbafe75e197fb... Author: Marius Tomaschewski Date: 2014-09-09 (Tue, 09 Sep 2014) Changed paths: M etc/common.xml.in M man/wicked-config.5.in M src/config.c Log Message: ----------- Merge pull request #411 from okirch/config-doc Compare: https://github.com/openSUSE/wicked/compare/7f5655e10087...17834b248812