packages: util-vserver/util-vserver-pivot-root-ugly-hack.patch, util-vserve...

[arekm]

Author: arekm                        Date: Tue Nov  2 19:40:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to pre2921

---- Files affected:
packages/util-vserver:
   util-vserver-pivot-root-ugly-hack.patch (1.2 -> 1.3) , util-vserver-vsysvwrapper.patch (1.5 -> 1.6) , util-vserver.spec (1.266 -> 1.267) 

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch
diff -u packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch:1.2 packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch:1.3
--- packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch:1.2	Tue Jul 28 12:08:57 2009
+++ packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch	Tue Nov  2 20:40:13 2010
@@ -41,18 +41,19 @@
    switch (feature) {
      case vcFEATURE_COMPAT	:  return true;
      case vcFEATURE_VSHELPER0	:  return ver >= 0x00010000 && ver < 0x00010010;
-@@ -49,7 +71,13 @@
-     case vcFEATURE_VSTAT	:  return ver >= 0x00020103;
+@@ -71,7 +71,13 @@
+     case vcFEATURE_VSTAT	:  return ver >= 0x00020103 && ver < 0x00020306;
      case vcFEATURE_PPTAG	:  return conf & VC_VCI_PPTAG;
      case vcFEATURE_SPACES	:  return conf & VC_VCI_SPACES;
 -    case vcFEATURE_PIVOT_ROOT	:  return ver >= 0x00020304;
-+   // Now THIS is really ugly hack, only vs2.3 patches for kernels below
-+   // have pivot_root working for vservers, so we assume people use recent
-+   // patches with recent kernels
++    // Now THIS is really ugly hack, only vs2.3 patches for kernels below
++    // have pivot_root working for vservers, so we assume people use recent
++    // patches with recent kernels
 +    case vcFEATURE_PIVOT_ROOT	:  return (ver >= 0x00020304) &&
-+				  ((kver >= 0x02062723 && kver < 0x02062800) ||
-+				   (kver >= 0x02062811 && kver < 0x02062900) ||
-+				   (kver >= 0x02062901));
-     case vcFEATURE_PIDSPACE	:  return ver >= 0x00020305;
-     default			:  assert(false); 
-   }
++				   ((kver >= 0x02062723 && kver < 0x02062800) ||
++				    (kver >= 0x02062811 && kver < 0x02062900) ||
++				    (kver >= 0x02062901));
+     case vcFEATURE_PIDSPACE	:  return false;
+     case vcFEATURE_MEMCG	:  return ver >= 0x00020306 && conf & VC_VCI_MEMCG;
+     case vcFEATURE_DYNAMIC	:  return ver <  0x00020300 || !(conf & VC_VCI_NO_DYNAMIC);
+

================================================================
Index: packages/util-vserver/util-vserver-vsysvwrapper.patch
diff -u packages/util-vserver/util-vserver-vsysvwrapper.patch:1.5 packages/util-vserver/util-vserver-vsysvwrapper.patch:1.6
--- packages/util-vserver/util-vserver-vsysvwrapper.patch:1.5	Mon Nov 14 01:01:53 2005
+++ packages/util-vserver/util-vserver-vsysvwrapper.patch	Tue Nov  2 20:40:13 2010
@@ -18,11 +18,13 @@
  . "$UTIL_VSERVER_VARS"
  
  if [ $# = 0 ] ; then
-@@ -40,6 +41,5 @@
+@@ -46,6 +46,6 @@
  	do
  		IPOPT="$IPOPT --ip $oneip"
  	done
--	echo exec $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
--	exec $_CHBIND $IPOPT /etc/init.d/$SERVICE "$@"
-+	exec $_CHBIND $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
+-	echo exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/init.d/$SERVICE "$@"
+-	exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/init.d/$SERVICE "$@"
++	echo exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
++	exec $_CHBIND ${NID:+--nid $NID} $IPOPT /etc/rc.d/init.d/$SERVICE "$@"
  fi
+

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.266 packages/util-vserver/util-vserver.spec:1.267
--- packages/util-vserver/util-vserver.spec:1.266	Fri Aug  6 20:35:50 2010
+++ packages/util-vserver/util-vserver.spec	Tue Nov  2 20:40:13 2010
@@ -19,7 +19,7 @@
 %undefine	with_doc
 %endif
 
-%define		snap	pre2904
+%define		snap	pre2921
 %define		rel	1
 Summary:	Linux virtual server utilities
 Summary(pl.UTF-8):	Narzędzia dla linuksowych serwerów wirtualnych
@@ -29,7 +29,7 @@
 License:	GPL
 Group:		Applications/System
 Source0:	http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2
-# Source0-md5:	45ad60fb043d1f9fefaddfafb3b3b867
+# Source0-md5:	21b9cbdcd4943b469d8e720826337edd
 Source1:	vprocunhide.init
 Source2:	vservers.init
 Source3:	vservers-legacy.init
@@ -876,6 +876,8 @@
 %{_libdir}/%{name}/distributions/f9
 %{_libdir}/%{name}/distributions/f10
 %{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/f12
+%{_libdir}/%{name}/distributions/f13
 %{_libdir}/%{name}/distributions/fc1
 %{_libdir}/%{name}/distributions/fc2
 %{_libdir}/%{name}/distributions/fc3
@@ -941,6 +943,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.267  2010/11/02 19:40:13  arekm
+- up to pre2921
+
 Revision 1.266  2010/08/06 18:35:50  arekm
 - up to 2904
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver-pivot-root-ugly-hack.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver-vsysvwrapper.patch?r1=1.5&r2=1.6&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.266&r2=1.267&f=u