Back out netns usage for now for https://pagure.io/releng/issue/6602

This commit is contained in:
Colin Walters 2017-01-27 03:10:11 -05:00
parent d0f658d726
commit f4d2fc43cd
2 changed files with 31 additions and 1 deletions

View File

@ -0,0 +1,25 @@
From fa250c4e127eab158f5f67485cb28961cbb6b294 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Fri, 27 Jan 2017 03:07:37 -0500
Subject: [PATCH] Back out network namespace usage
To work around https://pagure.io/releng/issue/6602
---
src/libpriv/rpmostree-bwrap.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/libpriv/rpmostree-bwrap.c b/src/libpriv/rpmostree-bwrap.c
index 40cb3dc..10dfe42 100644
--- a/src/libpriv/rpmostree-bwrap.c
+++ b/src/libpriv/rpmostree-bwrap.c
@@ -208,7 +208,6 @@ rpmostree_bwrap_new (int rootfs_fd,
* but it may need some mapping work.
*/
"--unshare-pid",
- "--unshare-net",
"--unshare-uts",
"--unshare-ipc",
"--unshare-cgroup-try",
--
2.9.3

View File

@ -1,7 +1,7 @@
Summary: Client side upgrade program and server side compose tool Summary: Client side upgrade program and server side compose tool
Name: rpm-ostree Name: rpm-ostree
Version: 2017.1 Version: 2017.1
Release: 2%{?dist} Release: 3%{?dist}
#VCS: https://github.com/cgwalters/rpm-ostree #VCS: https://github.com/cgwalters/rpm-ostree
# This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot" # This tarball is generated via "make -f Makefile.dist-packaging dist-snapshot"
Source0: rpm-ostree-%{version}.tar.xz Source0: rpm-ostree-%{version}.tar.xz
@ -28,6 +28,8 @@ BuildRequires: libattr-devel
# We currently interact directly with librepo # We currently interact directly with librepo
BuildRequires: pkgconfig(librepo) BuildRequires: pkgconfig(librepo)
Patch0: 0001-Back-out-network-namespace-usage.patch
# libhif bundling # libhif bundling
# We're using RPATH to pick up our bundled version # We're using RPATH to pick up our bundled version
%global __requires_exclude ^libhif[.]so[.].*$ %global __requires_exclude ^libhif[.]so[.].*$
@ -122,6 +124,9 @@ python autofiles.py > files.devel \
%files devel -f files.devel %files devel -f files.devel
%changelog %changelog
* Fri Jan 27 2017 Colin Walters <walters@verbum.org> - 2017.1-3
- Back out netns usage for now for https://pagure.io/releng/issue/6602
* Sun Jan 22 2017 Colin Walters <walters@verbum.org> - 2017.1-2 * Sun Jan 22 2017 Colin Walters <walters@verbum.org> - 2017.1-2
- New upstream version - New upstream version