[vzctl] Set default values of LOCAL_*ID to zero until userns is enabled

Andrey Vagin avagin at fedoraproject.org
Thu Jun 6 07:42:14 UTC 2013


commit a26ec8e81cfe8431d92fbdbd3cd1b94391c69f5b
Author: Andrey Vagin <avagin at openvz.org>
Date:   Wed Jun 5 23:25:45 2013 +0400

    Set default values of LOCAL_*ID to zero until userns is enabled
    
    CONFIG_USER_NS is not set in the kernel config.

 ...-values-of-LOCAL_-ID-to-zero-until-userns.patch |   29 ++++++++++++++++++++
 vzctl.spec                                         |    2 +
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
new file mode 100644
index 0000000..ca6006b
--- /dev/null
+++ b/0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
@@ -0,0 +1,29 @@
+From 7af15c352fc0603fe0e854c289152474f8e4553a Mon Sep 17 00:00:00 2001
+From: Andrey Vagin <avagin at openvz.org>
+Date: Wed, 5 Jun 2013 23:17:21 +0400
+Subject: [PATCH] Set default values of LOCAL_*ID to zero until userns is enabled
+
+
+Signed-off-by: Andrey Vagin <avagin at openvz.org>
+---
+ etc/vz.conf.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/etc/vz.conf.in b/etc/vz.conf.in
+index de240ac..cdb3bd2 100644
+--- a/etc/vz.conf.in
++++ b/etc/vz.conf.in
+@@ -40,8 +40,8 @@ DEF_OSTEMPLATE="centos-5"
+ #VE_LAYOUT=ploop
+ 
+ # User namespace configuration
+-LOCAL_UID=100000
+-LOCAL_GID=100000
++LOCAL_UID=0
++LOCAL_GID=0
+ 
+ ## Load vzwdog module
+ VZWDOG="no"
+-- 
+1.8.2
+
diff --git a/vzctl.spec b/vzctl.spec
index 840f080..a216055 100644
--- a/vzctl.spec
+++ b/vzctl.spec
@@ -30,6 +30,7 @@ Release: %{rel}%{?dist}
 License: GPLv2+
 Group: System Environment/Kernel
 Source: http://download.openvz.org/utils/%{name}/%{version}/src/%{name}-%{version}.tar.bz2
+Patch0: 0001-Set-default-values-of-LOCAL_-ID-to-zero-until-userns.patch
 URL: http://openvz.org/
 
 # OpenVZ can run on its own kernel, and if that it is the case, some more
@@ -61,6 +62,7 @@ i.e. create, start, shutdown, set various options and limits etc.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %configure \


More information about the scm-commits mailing list