+++ /dev/null
-diff -ur libvirt-0.9.11/src/Makefile.am libvirt-0.9.11-mod/src/Makefile.am
---- libvirt-0.9.11/src/Makefile.am 2012-03-23 14:56:20.000000000 +0100
-+++ libvirt-0.9.11-mod/src/Makefile.am 2012-04-01 11:47:02.416334370 +0200
-@@ -635,12 +635,8 @@
- endif
-
- if WITH_REMOTE
--if WITH_DRIVER_MODULES
--mod_LTLIBRARIES += libvirt_driver_remote.la
--else
- noinst_LTLIBRARIES += libvirt_driver_remote.la
- libvirt_la_BUILT_LIBADD += libvirt_driver_remote.la
--endif
- libvirt_driver_remote_la_CFLAGS = \
- $(GNUTLS_CFLAGS) \
- $(XDR_CFLAGS) \
-@@ -648,10 +644,6 @@
- libvirt-net-rpc-client.la \
- libvirt-net-rpc-server.la \
- libvirt-net-rpc.la
--if WITH_DRIVER_MODULES
--libvirt_driver_remote_la_LIBADD += ../gnulib/lib/libgnu.la
--libvirt_driver_remote_la_LDFLAGS += -module -avoid-version
--endif
- libvirt_driver_remote_la_SOURCES = $(REMOTE_DRIVER_SOURCES)
-
- $(srcdir)/remote/remote_driver.c: $(REMOTE_DRIVER_GENERATED)
-@@ -832,6 +832,10 @@
- $(LIBNL_CFLAGS) \
- -I$(top_srcdir)/src/conf $(AM_CFLAGS)
- libvirt_driver_lxc_la_LIBADD = $(CAPNG_LIBS) $(LIBNL_LIBS)
-+if HAVE_LIBBLKID
-+libvirt_driver_lxc_la_CFLAGS += $(BLKID_CFLAGS)
-+libvirt_driver_lxc_la_LIBADD += $(BLKID_LIBS)
-+endif
- if WITH_SECDRIVER_SELINUX
- libvirt_driver_lxc_la_LIBADD += $(SELINUX_LIBS)
- endif
-@@ -1070,7 +1054,6 @@
- endif
-
- if WITH_DRIVER_MODULES
--libvirt_driver_nodedev_la_LIBADD += ../gnulib/lib/libgnu.la
- libvirt_driver_nodedev_la_LDFLAGS += -module -avoid-version
- endif
- endif
---- libvirt-0.9.11/src/driver.c~ 2011-07-20 03:23:18.000000000 +0200
-+++ libvirt-0.9.11/src/driver.c 2012-04-19 13:20:05.906390855 +0200
-@@ -39,7 +39,7 @@
- # include <dlfcn.h>
-
- void *
--virDriverLoadModule(const char *name)
-+virDriverLoadModule(const char *name, int global)
- {
- const char *moddir = getenv("LIBVIRT_DRIVER_DIR");
- char *modfile = NULL, *regfunc = NULL;
-@@ -59,7 +59,10 @@
- goto cleanup;
- }
-
-- handle = dlopen(modfile, RTLD_NOW | RTLD_LOCAL);
-+ if (global)
-+ handle = dlopen(modfile, RTLD_NOW | RTLD_GLOBAL);
-+ else
-+ handle = dlopen(modfile, RTLD_NOW | RTLD_LOCAL);
- if (!handle) {
- VIR_ERROR(_("failed to load module %s %s"), modfile, dlerror());
- goto cleanup;
---- libvirt-0.9.11/src/driver.h~ 2012-03-09 08:33:16.000000000 +0100
-+++ libvirt-0.9.11/src/driver.h 2012-04-19 13:20:26.199724041 +0200
-@@ -1621,6 +1621,6 @@
- # ifdef WITH_LIBVIRTD
- int virRegisterStateDriver(virStateDriverPtr);
- # endif
--void *virDriverLoadModule(const char *name);
-+void *virDriverLoadModule(const char *name, int global);
-
- #endif /* __VIR_DRIVER_H__ */
---- libvirt-0.9.11/src/libvirt.c~ 2012-03-31 12:22:02.000000000 +0200
-+++ libvirt-0.9.11/src/libvirt.c 2012-04-19 12:32:29.704680534 +0200
-@@ -431,32 +431,29 @@
- * is not loaded they'll get a suitable error at that point
- */
- # ifdef WITH_TEST
-- virDriverLoadModule("test");
-+ virDriverLoadModule("test", 0);
- # endif
- # ifdef WITH_XEN
-- virDriverLoadModule("xen");
-+ virDriverLoadModule("xen", 0);
- # endif
- # ifdef WITH_OPENVZ
-- virDriverLoadModule("openvz");
-+ virDriverLoadModule("openvz", 0);
- # endif
- # ifdef WITH_VMWARE
-- virDriverLoadModule("vmware");
-+ virDriverLoadModule("vmware", 0);
- # endif
- # ifdef WITH_VBOX
-- virDriverLoadModule("vbox");
-+ virDriverLoadModule("vbox", 0);
- # endif
- # ifdef WITH_ESX
-- virDriverLoadModule("esx");
-+ virDriverLoadModule("esx", 0);
- # endif
- # ifdef WITH_HYPERV
-- virDriverLoadModule("hyperv");
-+ virDriverLoadModule("hyperv", 0);
- # endif
- # ifdef WITH_XENAPI
-- virDriverLoadModule("xenapi");
-+ virDriverLoadModule("xenapi", 0);
- # endif
--# ifdef WITH_REMOTE
-- virDriverLoadModule("remote");
--# endif
- #else
- # ifdef WITH_TEST
- if (testRegister() == -1) return -1;
-@@ -482,10 +482,10 @@
- # ifdef WITH_XENAPI
- if (xenapiRegister() == -1) return -1;
- # endif
-+#endif
- # ifdef WITH_REMOTE
- if (remoteRegister () == -1) return -1;
- # endif
--#endif
-
- return 0;
- }
---- libvirt-0.9.11/daemon/libvirtd.c~ 2012-03-31 12:22:02.000000000 +0200
-+++ libvirt-0.9.11/daemon/libvirtd.c 2012-04-19 13:24:33.839722250 +0200
-@@ -401,14 +401,14 @@
- * If they try to open a connection for a module that
- * is not loaded they'll get a suitable error at that point
- */
-- virDriverLoadModule("network");
-- virDriverLoadModule("storage");
-- virDriverLoadModule("nodedev");
-- virDriverLoadModule("secret");
-- virDriverLoadModule("qemu");
-- virDriverLoadModule("lxc");
-- virDriverLoadModule("uml");
-- virDriverLoadModule("nwfilter");
-+ virDriverLoadModule("network", 1);
-+ virDriverLoadModule("storage", 0);
-+ virDriverLoadModule("nodedev", 0);
-+ virDriverLoadModule("secret", 0);
-+ virDriverLoadModule("qemu", 0);
-+ virDriverLoadModule("lxc", 0);
-+ virDriverLoadModule("uml", 0);
-+ virDriverLoadModule("nwfilter", 0);
- #else
- # ifdef WITH_NETWORK
- networkRegister();
-diff -ur libvirt-0.9.12/src/lxc/lxc_controller.c libvirt-0.9.12-lxc/src/lxc/lxc_controller.c
---- libvirt-0.9.12/src/lxc/lxc_controller.c 2012-05-17 11:55:25.719689270 +0200
-+++ libvirt-0.9.12-lxc/src/lxc/lxc_controller.c 2012-05-17 11:54:54.623023703 +0200
-@@ -43,6 +43,7 @@
- #include <dirent.h>
+--- libvirt-0.9.13/src/lxc/lxc_controller.c.orig 2012-06-25 09:06:18.000000000 +0200
++++ libvirt-0.9.13/src/lxc/lxc_controller.c 2012-07-08 11:48:06.949684744 +0200
+@@ -44,6 +44,7 @@
#include <grp.h>
#include <sys/stat.h>
+ #include <time.h>
+#include <sys/time.h>
#if HAVE_CAPNG
# include <cap-ng.h>
-@@ -559,6 +560,7 @@
+@@ -558,6 +559,7 @@
return ret;
}
/**
* lxcSetContainerResources
-@@ -618,10 +620,13 @@
+@@ -617,10 +619,13 @@
_("Unable to add task %d to cgroup for domain %s"),
getpid(), def->name);
}
return rc;
}
-@@ -710,6 +715,63 @@
+@@ -709,6 +714,63 @@
static bool quit = false;
static virMutex lock;
static int sigpipe[2];
static void lxcSignalChildHandler(int signum ATTRIBUTE_UNUSED)
{
-@@ -1135,6 +1196,18 @@
+@@ -1134,6 +1196,18 @@
goto cleanup;
}
VIR_DEBUG("serverFd=%d clientFd=%d",
serverFd, clientFd);
virResetLastError();
-@@ -1554,6 +1627,7 @@
+@@ -1539,6 +1613,7 @@
goto cleanup;
VIR_FORCE_CLOSE(control[1]);
VIR_FORCE_CLOSE(containerhandshake[1]);
install-data-sasl:
uninstall-data-sasl:
diff -ru libvirt-0.8.8/daemon/test_libvirtd.aug libvirt-0.8.8-sasl/daemon/test_libvirtd.aug
---- libvirt-0.8.8/daemon/test_libvirtd.aug 2011-01-31 02:30:59.000000000 +0100
-+++ libvirt-0.8.8-sasl/daemon/test_libvirtd.aug 2011-04-28 11:45:47.697741165 +0200
-@@ -108,7 +108,7 @@
- # the network providing auth (eg, TLS/x509 certificates)
- #
- # - sasl: use SASL infrastructure. The actual auth scheme is then
--# controlled from /etc/sasl2/libvirt.conf. For the TCP
-+# controlled from /etc/sasl/libvirt.conf. For the TCP
- # socket only GSSAPI & DIGEST-MD5 mechanisms will be used.
- # For non-TCP or TLS sockets, any scheme is allowed.
- #
-@@ -139,7 +139,7 @@
- # If you don't enable SASL, then all TCP traffic is cleartext.
- # Don't do this outside of a dev/test scenario. For real world
- # use, always enable SASL and use the GSSAPI or DIGEST-MD5
--# mechanism in /etc/sasl2/libvirt.conf
-+# mechanism in /etc/sasl/libvirt.conf
- auth_tcp = \"sasl\"
-
- # Change the authentication scheme for TLS sockets.
-@@ -383,7 +383,7 @@
- { "#comment" = "the network providing auth (eg, TLS/x509 certificates)" }
- { "#comment" = "" }
- { "#comment" = "- sasl: use SASL infrastructure. The actual auth scheme is then" }
-- { "#comment" = "controlled from /etc/sasl2/libvirt.conf. For the TCP" }
-+ { "#comment" = "controlled from /etc/sasl/libvirt.conf. For the TCP" }
- { "#comment" = "socket only GSSAPI & DIGEST-MD5 mechanisms will be used." }
- { "#comment" = "For non-TCP or TLS sockets, any scheme is allowed." }
- { "#comment" = "" }
-@@ -414,7 +414,7 @@
- { "#comment" = "If you don't enable SASL, then all TCP traffic is cleartext." }
- { "#comment" = "Don't do this outside of a dev/test scenario. For real world" }
- { "#comment" = "use, always enable SASL and use the GSSAPI or DIGEST-MD5" }
-- { "#comment" = "mechanism in /etc/sasl2/libvirt.conf" }
-+ { "#comment" = "mechanism in /etc/sasl/libvirt.conf" }
- { "auth_tcp" = "sasl" }
- { "#empty" }
- { "#comment" = "Change the authentication scheme for TLS sockets." }
diff -ru libvirt-0.8.8/docs/auth.html libvirt-0.8.8-sasl/docs/auth.html
--- libvirt-0.8.8/docs/auth.html 2011-02-17 05:13:12.000000000 +0100
+++ libvirt-0.8.8-sasl/docs/auth.html 2011-04-28 11:45:43.429741167 +0200
%endif
%files devel
-diff -ru libvirt-0.8.8/src/qemu/qemu.conf libvirt-0.8.8-sasl/src/qemu/qemu.conf
---- libvirt-0.8.8/src/qemu/qemu.conf 2011-02-16 07:36:53.000000000 +0100
-+++ libvirt-0.8.8-sasl/src/qemu/qemu.conf 2011-04-28 11:45:47.091741165 +0200
+--- libvirt-0.9.13/src/qemu/qemu.conf.orig 2012-05-31 16:23:22.000000000 +0200
++++ libvirt-0.9.13/src/qemu/qemu.conf 2012-07-08 11:37:16.366378718 +0200
@@ -74,18 +74,18 @@
# Examples include vinagre, virt-viewer and virt-manager
# itself. UltraVNC, RealVNC, TightVNC do not support this
+# It is necessary to configure /etc/sasl/qemu.conf to choose
# the desired SASL plugin (eg, GSSPI for Kerberos)
#
- # vnc_sasl = 1
+ #vnc_sasl = 1
-# The default SASL configuration file is located in /etc/sasl2/
# override the configs in this location. Set this parameter to
# point to the directory, and create a qemu.conf in that location
#
--# vnc_sasl_dir = "/some/directory/sasl2"
-+# vnc_sasl_dir = "/some/directory/sasl"
-
+-#vnc_sasl_dir = "/some/directory/sasl2"
++#vnc_sasl_dir = "/some/directory/sasl"
+ # QEMU implements an extension for providing audio over a VNC connection,
diff -ru libvirt-0.8.8/src/qemu/test_libvirtd_qemu.aug libvirt-0.8.8-sasl/src/qemu/test_libvirtd_qemu.aug
---- libvirt-0.8.8/src/qemu/test_libvirtd_qemu.aug 2011-01-31 02:30:59.000000000 +0100
-+++ libvirt-0.8.8-sasl/src/qemu/test_libvirtd_qemu.aug 2011-04-28 11:45:47.103741165 +0200
-@@ -67,18 +67,18 @@
- # Examples include vinagre, virt-viewer and virt-manager
- # itself. UltraVNC, RealVNC, TightVNC do not support this
- #
--# It is necessary to configure /etc/sasl2/qemu.conf to choose
-+# It is necessary to configure /etc/sasl/qemu.conf to choose
- # the desired SASL plugin (eg, GSSPI for Kerberos)
- #
- vnc_sasl = 1
-
-
--# The default SASL configuration file is located in /etc/sasl2/
-+# The default SASL configuration file is located in /etc/sasl/
- # When running libvirtd unprivileged, it may be desirable to
- # override the configs in this location. Set this parameter to
- # point to the directory, and create a qemu.conf in that location
- #
--vnc_sasl_dir = \"/some/directory/sasl2\"
-+vnc_sasl_dir = \"/some/directory/sasl\"
-
- security_driver = \"selinux\"
-
-@@ -181,18 +181,18 @@
- { "#comment" = "Examples include vinagre, virt-viewer and virt-manager" }
- { "#comment" = "itself. UltraVNC, RealVNC, TightVNC do not support this" }
- { "#comment" = "" }
--{ "#comment" = "It is necessary to configure /etc/sasl2/qemu.conf to choose" }
-+{ "#comment" = "It is necessary to configure /etc/sasl/qemu.conf to choose" }
- { "#comment" = "the desired SASL plugin (eg, GSSPI for Kerberos)" }
- { "#comment" = "" }
- { "vnc_sasl" = "1" }
- { "#empty" }
- { "#empty" }
--{ "#comment" = "The default SASL configuration file is located in /etc/sasl2/" }
-+{ "#comment" = "The default SASL configuration file is located in /etc/sasl/" }
- { "#comment" = "When running libvirtd unprivileged, it may be desirable to" }
- { "#comment" = "override the configs in this location. Set this parameter to" }
- { "#comment" = "point to the directory, and create a qemu.conf in that location" }
- { "#comment" = "" }
--{ "vnc_sasl_dir" = "/some/directory/sasl2" }
-+{ "vnc_sasl_dir" = "/some/directory/sasl" }
- { "#empty" }
- { "security_driver" = "selinux" }
- { "#empty" }
diff -ru libvirt-0.8.8/tests/confdata/libvirtd.conf libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf
--- libvirt-0.8.8/tests/confdata/libvirtd.conf 2010-05-27 14:03:22.000000000 +0200
+++ libvirt-0.8.8-sasl/tests/confdata/libvirtd.conf 2011-04-28 11:45:46.878741165 +0200
Summary: Toolkit to interact with virtualization capabilities
Summary(pl.UTF-8): Narzędzia współpracujące z funkcjami wirtualizacji
Name: libvirt
-Version: 0.9.12
-Release: 4
+Version: 0.9.13
+Release: 1
License: LGPL v2.1+
Group: Libraries
Source0: ftp://ftp.libvirt.org/libvirt/%{name}-%{version}.tar.gz
-# Source0-md5: 5e842bc55733ceba60c64767580ff3e4
+# Source0-md5: 86cbe53ee662e3b9e8bb0c63c737ba27
Source1: %{name}.init
Source2: %{name}.tmpfiles
Patch0: %{name}-sasl.patch
Patch1: %{name}-lxc.patch
Patch2: %{name}-qemu-acl.patch
Patch3: %{name}-xend.patch
-Patch4: lxc-without-selinux.patch
-Patch5: %{name}-driver-modules.patch
URL: http://www.libvirt.org/
BuildRequires: audit-libs-devel
BuildRequires: augeas-devel
Requires: libssh2 >= 1.0
Requires: libxml2 >= 1:2.6.0
Requires: openwsman-libs >= 2.2.3
+Obsoletes: libvirt-daemon-esx
+Obsoletes: libvirt-daemon-hyperv
+Obsoletes: libvirt-daemon-openvz
+Obsoletes: libvirt-daemon-phyp
+Obsoletes: libvirt-daemon-vbox
+Obsoletes: libvirt-daemon-vmware
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
wirtualizacji nowych wersji Linuksa. Wymaga podpakietu specyficznego
dla hipernadzorcy.
-%package daemon-esx
-Summary: Server side driver required to run VMware ESX guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości VMware ESX
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-esx
-Server side driver required to manage the virtualization capabilities
-of the VMware ESX emulators.
-
-%description daemon-esx -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji emulatora VMware ESX.
-
-%package daemon-hyperv
-Summary: Server side driver required to run Microsoft Hyper-V guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości Microsoft Hyper-V
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-hyperv
-Server side driver required to manage the virtualization capabilities
-of the Microsoft Hyper-V emulators.
-
-%description daemon-hyperv -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji emulatora Microsoft Hyper-V.
-
%package daemon-libxl
Summary: Server side driver required to run XEN guests (xenlight)
Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN (xenlight)
Sterownik wymagany po stronie serwera do zarządzania funkcjami
wirtualizacji LXC.
-%package daemon-openvz
-Summary: Server side driver required to run OpenVZ guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości OpenVZ
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-openvz
-Server side driver required to manage the virtualization capabilities
-of OpenVZ.
-
-%description daemon-openvz -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji OpenVZ.
-
-%package daemon-phyp
-Summary: Server side driver required to run Power Hypervisors guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości Power Hypervisors
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-phyp
-Server side driver required to manage the virtualization capabilities
-of Power Hypervisors.
-
-%description daemon-phyp -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji Power Hypervisors.
-
%package daemon-qemu
Summary: Server side driver required to run QEMU guests
Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości QEMU
Sterownik wymagany po stronie serwera do zarządzania funkcjami
wirtualizacji UML.
-%package daemon-vbox
-Summary: Server side driver required to run Oracle VirtualBox guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości Oracle VirtualBox
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-vbox
-Server side driver required to manage the virtualization capabilities
-of Oracle VirtualBox.
-
-%description daemon-vbox -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji Oracle VirtualBox.
-
-%package daemon-vmware
-Summary: Server side driver required to run VMware Workstation guests
-Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości VMware Workstation
-Group: Libraries
-Requires: %{name}-daemon = %{version}-%{release}
-Provides: libvirt(hypervisor)
-
-%description daemon-vmware
-Server side driver required to manage the virtualization capabilities
-of VMware Workstation.
-
-%description daemon-vmware -l pl.UTF-8
-Sterownik wymagany po stronie serwera do zarządzania funkcjami
-wirtualizacji VMware Workstation.
-
%package daemon-xen
Summary: Server side driver required to run XEN guests
Summary(pl.UTF-8): Sterownik wymagany po stronie serwera do uruchamiania gości XEN
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1
-%patch5 -p1
# weird translations
%{__rm} po/{my,eu_ES}.{po,gmo}
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_test.so
-
-%if %{with esx}
-%files daemon-esx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_esx.so
-%endif
-
-%if %{with hyperv}
-%files daemon-hyperv
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_hyperv.so
-%endif
%if %{with libxl}
%files daemon-libxl
%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
%endif
-%if %{with openvz}
-%files daemon-openvz
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_openvz.so
-%endif
-
-%if %{with phyp}
-%files daemon-phyp
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_phyp.so
-%endif
-
%if %{with qemu}
%files daemon-qemu
%defattr(644,root,root,755)
%attr(700,root,root) %dir /var/log/libvirt/uml
%endif
-%if %{with vbox}
-%files daemon-vbox
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
-%endif
-
-%if %{with vmware}
-%files daemon-vmware
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libvirt/connection-driver/libvirt_driver_vmware.so
-%endif
-
%if %{with xen}
%files daemon-xen
%defattr(644,root,root,755)
+++ /dev/null
---- libvirt-0.9.10/src/lxc/lxc_container.c~ 2012-02-13 08:06:23.000000000 +0100
-+++ libvirt-0.9.10/src/lxc/lxc_container.c 2012-03-17 20:40:10.960883236 +0100
-@@ -501,7 +501,7 @@
- if (pivotRoot) {
- #if HAVE_SELINUX
- if (getfilecon("/", &con) < 0 &&
-- errno != ENOTSUP) {
-+ errno != ENOTSUP && errno != ENODATA) {
- virReportSystemError(errno, "%s",
- _("Failed to query file context on /"));
- goto cleanup;
---- libvirt-0.9.10/src/lxc/lxc_controller.c~ 2012-03-17 20:14:16.117479754 +0100
-+++ libvirt-0.9.10/src/lxc/lxc_controller.c 2012-03-17 20:41:17.730886249 +0100
-@@ -1492,7 +1492,7 @@
-
- #if HAVE_SELINUX
- if (getfilecon(root->src, &con) < 0 &&
-- errno != ENOTSUP) {
-+ errno != ENOTSUP && errno != ENODATA) {
- virReportSystemError(errno,
- _("Failed to query file context on %s"),
- root->src);
projects / packages / libvirt.git / commitdiff