Hello community, here is the log from the commit of package libvirt for openSUSE:Factory checked in at 2015-03-27 09:40:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvirt (Old) and /work/SRC/openSUSE:Factory/.libvirt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libvirt" Changes: -------- --- /work/SRC/openSUSE:Factory/libvirt/libvirt.changes 2015-03-19 21:20:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvirt.new/libvirt.changes 2015-03-27 09:40:33.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 25 09:10:46 MDT 2015 - [email protected] + +- Disable interface driver if libnetcontrol cannot be initialized + Modified libvirt-suse-netcontrol.patch + boo#920551 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvirt-suse-netcontrol.patch ++++++ --- /var/tmp/diff_new_pack.o6rVRj/_old 2015-03-27 09:40:35.000000000 +0100 +++ /var/tmp/diff_new_pack.o6rVRj/_new 2015-03-27 09:40:35.000000000 +0100 @@ -145,6 +145,26 @@ /* open netcf */ if (ncf_init(&driver->netcf, NULL) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", +@@ -1146,6 +1186,19 @@ static virStateDriver interfaceStateDriv + + int netcfIfaceRegister(void) + { ++ struct netcf *netcf; ++ ++ /* Initialization of libnetcontrol will fail if NetworkManager is enabled. ++ * Skip registration if ncf_init fails. ++ * TODO: finer-grained check? E.g. is_nm_enabled() ++ */ ++ if (ncf_init(&netcf, NULL) != 0) { ++ VIR_WARN("Failed to intialize libnetcontrol. Management of interface devices is disabled"); ++ return 0; ++ } ++ ++ ncf_close(netcf); ++ + if (virSetSharedInterfaceDriver(&interfaceDriver) < 0) + return -1; + if (virRegisterStateDriver(&interfaceStateDriver) < 0) Index: libvirt-1.2.13/src/interface/interface_driver.c =================================================================== --- libvirt-1.2.13.orig/src/interface/interface_driver.c -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
