libvirt: Update to 1.1.4

Remove the patch that has been added upstream.
This commit is contained in:
Rickard Nilsson 2013-11-05 14:15:42 +01:00
parent d2de64cc66
commit b5554b3f5c
2 changed files with 2 additions and 35 deletions

View file

@ -3,14 +3,14 @@
, libtasn1, ebtables, libgcrypt, yajl, makeWrapper, pmutils, libcap_ng
}:
let version = "1.1.2"; in
let version = "1.1.4"; in
stdenv.mkDerivation {
name = "libvirt-${version}";
src = fetchurl {
url = "http://libvirt.org/sources/libvirt-${version}.tar.gz";
md5 = "1835bbfa492099bce12e2934870e5611";
sha256 = "13yr9g1dk1bzzlm9h93kmavncyg6svjv3rjrv43ccl3sc37za42r";
};
buildInputs =
@ -19,9 +19,6 @@ stdenv.mkDerivation {
libcap_ng
];
# see http://www.mail-archive.com/libvir-list@redhat.com/msg83693.html
patches = [ ./securtyfs_userns.patch ];
preConfigure =
''
PATH=${iproute}/sbin:${iptables}/sbin:${ebtables}/sbin:${lvm2}/sbin:${udev}/sbin:$PATH

View file

@ -1,30 +0,0 @@
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -750,7 +750,7 @@ err:
}
-static int lxcContainerMountBasicFS(void)
+static int lxcContainerMountBasicFS(bool userns_enabled)
{
const struct {
const char *src;
@@ -801,6 +801,9 @@ static int lxcContainerMountBasicFS(void)
continue;
#endif
+ if (STREQ(mnts[i].src, "securityfs") && userns_enabled)
+ continue;
+
if (virFileMakePath(mnts[i].dst) < 0) {
virReportSystemError(errno,
_("Failed to mkdir %s"),
@@ -1530,7 +1533,7 @@ static int lxcContainerSetupPivotRoot(virDomainDefPtr vmDef,
goto cleanup;
/* Mounts the core /proc, /sys, etc filesystems */
- if (lxcContainerMountBasicFS() < 0)
+ if (lxcContainerMountBasicFS(vmDef->idmap.nuidmap) < 0)
goto cleanup;
/* Mounts /proc/meminfo etc sysinfo */